diff options
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/gntdev.c | 6 | ||||
| -rw-r--r-- | drivers/xen/grant-table.c | 3 | ||||
| -rw-r--r-- | drivers/xen/xen-acpi-processor.c | 6 | ||||
| -rw-r--r-- | drivers/xen/xen-scsiback.c | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index a16e21d2ca91..61ea855c4508 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -158,10 +158,8 @@ struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count, NULL == add->being_removed) goto err; if (xen_pv_domain()) { - add->kmap_ops = kvmalloc_objs(add->kmap_ops[0], count, - GFP_KERNEL); - add->kunmap_ops = kvmalloc_objs(add->kunmap_ops[0], count, - GFP_KERNEL); + add->kmap_ops = kvmalloc_objs(add->kmap_ops[0], count); + add->kunmap_ops = kvmalloc_objs(add->kunmap_ops[0], count); if (NULL == add->kmap_ops || NULL == add->kunmap_ops) goto err; } diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 908d009f70fd..97e27f754d39 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1635,8 +1635,7 @@ int gnttab_init(void) */ max_nr_glist_frames = max_nr_grefs / RPP; - gnttab_list = kmalloc_objs(grant_ref_t *, max_nr_glist_frames, - GFP_KERNEL); + gnttab_list = kmalloc_objs(grant_ref_t *, max_nr_glist_frames); if (gnttab_list == NULL) return -ENOMEM; diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index d7effbaf8948..a395b382c649 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c @@ -61,8 +61,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr) unsigned int i, ok; int ret = 0; - dst_cx_states = kzalloc_objs(struct xen_processor_cx, _pr->power.count, - GFP_KERNEL); + dst_cx_states = kzalloc_objs(struct xen_processor_cx, _pr->power.count); if (!dst_cx_states) return -ENOMEM; @@ -412,8 +411,7 @@ static int check_acpi_ids(struct acpi_processor *pr_backup) return -ENOMEM; } - acpi_psd = kzalloc_objs(struct acpi_psd_package, nr_acpi_bits, - GFP_KERNEL); + acpi_psd = kzalloc_objs(struct acpi_psd_package, nr_acpi_bits); if (!acpi_psd) { bitmap_free(acpi_id_present); bitmap_free(acpi_id_cst_present); diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index dee1a05fdd44..3035c7d0f1b7 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -543,8 +543,7 @@ static int scsiback_gnttab_data_map(struct vscsiif_request *ring_req, } /* free of (sgl) in fast_flush_area() */ - pending_req->sgl = kmalloc_objs(struct scatterlist, nr_segments, - GFP_KERNEL); + pending_req->sgl = kmalloc_objs(struct scatterlist, nr_segments); if (!pending_req->sgl) return -ENOMEM; |