summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-02-21 16:37:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-02-21 17:09:51 -0800
commitbf4afc53b77aeaa48b5409da5c8da6bb4eff7f43 (patch)
tree01fdd9d27f1b272bef0127966e08eac44d134d0a /arch/s390
parente19e1b480ac73c3e62ffebbca1174f0f511f43e7 (diff)
downloadlwn-bf4afc53b77aeaa48b5409da5c8da6bb4eff7f43.tar.gz
lwn-bf4afc53b77aeaa48b5409da5c8da6bb4eff7f43.zip
Convert 'alloc_obj' family to use the new default GFP_KERNEL argument
This was done entirely with mindless brute force, using git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' | xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/' to convert the new alloc_obj() users that had a simple GFP_KERNEL argument to just drop that argument. Note that due to the extreme simplicity of the scripting, any slightly more complex cases spread over multiple lines would not be triggered: they definitely exist, but this covers the vast bulk of the cases, and the resulting diff is also then easier to check automatically. For the same reason the 'flex' versions will be done as a separate conversion. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/appldata/appldata_base.c4
-rw-r--r--arch/s390/appldata/appldata_mem.c2
-rw-r--r--arch/s390/appldata/appldata_net_sum.c2
-rw-r--r--arch/s390/hypfs/hypfs_dbfs.c2
-rw-r--r--arch/s390/hypfs/hypfs_diag0c.c2
-rw-r--r--arch/s390/hypfs/hypfs_sprp.c2
-rw-r--r--arch/s390/hypfs/inode.c2
-rw-r--r--arch/s390/include/asm/idals.h2
-rw-r--r--arch/s390/kernel/cert_store.c2
-rw-r--r--arch/s390/kernel/debug.c10
-rw-r--r--arch/s390/kernel/guarded_storage.c4
-rw-r--r--arch/s390/kernel/os_info.c2
-rw-r--r--arch/s390/kernel/perf_cpum_cf.c4
-rw-r--r--arch/s390/kernel/perf_cpum_cf_events.c2
-rw-r--r--arch/s390/kernel/perf_cpum_sf.c2
-rw-r--r--arch/s390/kernel/perf_pai.c6
-rw-r--r--arch/s390/kernel/ptrace.c6
-rw-r--r--arch/s390/kernel/runtime_instr.c2
-rw-r--r--arch/s390/kernel/smp.c2
-rw-r--r--arch/s390/kernel/vdso.c2
-rw-r--r--arch/s390/kvm/pci.c6
-rw-r--r--arch/s390/kvm/pv.c2
-rw-r--r--arch/s390/mm/extmem.c2
-rw-r--r--arch/s390/net/bpf_jit_comp.c2
-rw-r--r--arch/s390/pci/pci.c4
-rw-r--r--arch/s390/pci/pci_bus.c2
-rw-r--r--arch/s390/pci/pci_irq.c4
27 files changed, 42 insertions, 42 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 0d6725fd881e..edbedbb2a773 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -140,7 +140,7 @@ int appldata_diag(char record_nr, u16 function, unsigned long buffer,
struct appldata_product_id *id;
int rc;
- parm_list = kmalloc_obj(*parm_list, GFP_KERNEL);
+ parm_list = kmalloc_obj(*parm_list);
id = kmemdup(&appldata_id, sizeof(appldata_id), GFP_KERNEL);
rc = -ENOMEM;
if (parm_list && id) {
@@ -350,7 +350,7 @@ int appldata_register_ops(struct appldata_ops *ops)
if (ops->size > APPLDATA_MAX_REC_SIZE)
return -EINVAL;
- ops->ctl_table = kzalloc_objs(struct ctl_table, 1, GFP_KERNEL);
+ ops->ctl_table = kzalloc_objs(struct ctl_table, 1);
if (!ops->ctl_table)
return -ENOMEM;
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index e24369ec3134..659af5545a38 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -130,7 +130,7 @@ static int __init appldata_mem_init(void)
{
int ret;
- ops.data = kzalloc_obj(struct appldata_mem_data, GFP_KERNEL);
+ ops.data = kzalloc_obj(struct appldata_mem_data);
if (!ops.data)
return -ENOMEM;
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 3a0574f33664..972f6d592c32 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -132,7 +132,7 @@ static int __init appldata_net_init(void)
{
int ret;
- ops.data = kzalloc_obj(struct appldata_net_sum_data, GFP_KERNEL);
+ ops.data = kzalloc_obj(struct appldata_net_sum_data);
if (!ops.data)
return -ENOMEM;
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 8002bdc692d6..25a59c048857 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -16,7 +16,7 @@ static struct hypfs_dbfs_data *hypfs_dbfs_data_alloc(struct hypfs_dbfs_file *f)
{
struct hypfs_dbfs_data *data;
- data = kmalloc_obj(*data, GFP_KERNEL);
+ data = kmalloc_obj(*data);
if (!data)
return NULL;
data->dbfs_file = f;
diff --git a/arch/s390/hypfs/hypfs_diag0c.c b/arch/s390/hypfs/hypfs_diag0c.c
index 5e27dc7a7569..8f726e6558a8 100644
--- a/arch/s390/hypfs/hypfs_diag0c.c
+++ b/arch/s390/hypfs/hypfs_diag0c.c
@@ -35,7 +35,7 @@ static void *diag0c_store(unsigned int *count)
cpus_read_lock();
cpu_count = num_online_cpus();
- cpu_vec = kmalloc_objs(*cpu_vec, num_possible_cpus(), GFP_KERNEL);
+ cpu_vec = kmalloc_objs(*cpu_vec, num_possible_cpus());
if (!cpu_vec)
goto fail_unlock_cpus;
/* Note: Diag 0c needs 8 byte alignment and real storage */
diff --git a/arch/s390/hypfs/hypfs_sprp.c b/arch/s390/hypfs/hypfs_sprp.c
index 2e8847048dc1..08042d3a9d56 100644
--- a/arch/s390/hypfs/hypfs_sprp.c
+++ b/arch/s390/hypfs/hypfs_sprp.c
@@ -74,7 +74,7 @@ static int __hypfs_sprp_ioctl(void __user *user_area)
rc = -ENOMEM;
data = (void *)get_zeroed_page(GFP_KERNEL);
- diag304 = kzalloc_obj(*diag304, GFP_KERNEL);
+ diag304 = kzalloc_obj(*diag304);
if (!data || !diag304)
goto out;
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 0f4a9113ec1a..559b011e6880 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -292,7 +292,7 @@ static int hypfs_init_fs_context(struct fs_context *fc)
{
struct hypfs_sb_info *sbi;
- sbi = kzalloc_obj(struct hypfs_sb_info, GFP_KERNEL);
+ sbi = kzalloc_obj(struct hypfs_sb_info);
if (!sbi)
return -ENOMEM;
diff --git a/arch/s390/include/asm/idals.h b/arch/s390/include/asm/idals.h
index 94de4ddf503f..06e1ec2afd5a 100644
--- a/arch/s390/include/asm/idals.h
+++ b/arch/s390/include/asm/idals.h
@@ -195,7 +195,7 @@ static inline struct idal_buffer **idal_buffer_array_alloc(size_t size, int page
int i;
count = (size + CCW_MAX_BYTE_COUNT - 1) / CCW_MAX_BYTE_COUNT;
- ibs = kmalloc_objs(*ibs, count + 1, GFP_KERNEL);
+ ibs = kmalloc_objs(*ibs, count + 1);
for (i = 0; i < count; i++) {
/* Determine size for the current idal buffer */
ib_size = min(size, CCW_MAX_BYTE_COUNT);
diff --git a/arch/s390/kernel/cert_store.c b/arch/s390/kernel/cert_store.c
index 8e3964c33ebb..dc1992a675de 100644
--- a/arch/s390/kernel/cert_store.c
+++ b/arch/s390/kernel/cert_store.c
@@ -322,7 +322,7 @@ static int invalidate_keyring_keys(struct key *keyring)
keyring_payload_len = key_type_keyring.read(keyring, NULL, 0);
num_keys = keyring_payload_len / sizeof(key_serial_t);
- key_array = kzalloc_objs(key_serial_t, num_keys, GFP_KERNEL);
+ key_array = kzalloc_objs(key_serial_t, num_keys);
if (!key_array)
return -ENOMEM;
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index a917b4c899ef..31430e9bcfdd 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -181,7 +181,7 @@ static debug_entry_t ***debug_areas_alloc(int pages_per_area, int nr_areas)
debug_entry_t ***areas;
int i, j;
- areas = kmalloc_objs(debug_entry_t **, nr_areas, GFP_KERNEL);
+ areas = kmalloc_objs(debug_entry_t **, nr_areas);
if (!areas)
goto fail_malloc_areas;
for (i = 0; i < nr_areas; i++) {
@@ -224,13 +224,13 @@ static debug_info_t *debug_info_alloc(const char *name, int pages_per_area,
debug_info_t *rc;
/* alloc everything */
- rc = kmalloc_obj(debug_info_t, GFP_KERNEL);
+ rc = kmalloc_obj(debug_info_t);
if (!rc)
goto fail_malloc_rc;
- rc->active_entries = kzalloc_objs(int, nr_areas, GFP_KERNEL);
+ rc->active_entries = kzalloc_objs(int, nr_areas);
if (!rc->active_entries)
goto fail_malloc_active_entries;
- rc->active_pages = kzalloc_objs(int, nr_areas, GFP_KERNEL);
+ rc->active_pages = kzalloc_objs(int, nr_areas);
if (!rc->active_pages)
goto fail_malloc_active_pages;
if ((mode == ALL_AREAS) && (pages_per_area != 0)) {
@@ -630,7 +630,7 @@ static file_private_info_t *debug_file_private_alloc(debug_info_t *debug_info,
if (!debug_info_snapshot)
return NULL;
- p_info = kmalloc_obj(file_private_info_t, GFP_KERNEL);
+ p_info = kmalloc_obj(file_private_info_t);
if (!p_info) {
debug_info_free(debug_info_snapshot);
return NULL;
diff --git a/arch/s390/kernel/guarded_storage.c b/arch/s390/kernel/guarded_storage.c
index 4d4101f19e3c..cab8ac25a010 100644
--- a/arch/s390/kernel/guarded_storage.c
+++ b/arch/s390/kernel/guarded_storage.c
@@ -24,7 +24,7 @@ static int gs_enable(void)
struct gs_cb *gs_cb;
if (!current->thread.gs_cb) {
- gs_cb = kzalloc_obj(*gs_cb, GFP_KERNEL);
+ gs_cb = kzalloc_obj(*gs_cb);
if (!gs_cb)
return -ENOMEM;
gs_cb->gsd = 25;
@@ -55,7 +55,7 @@ static int gs_set_bc_cb(struct gs_cb __user *u_gs_cb)
gs_cb = current->thread.gs_bc_cb;
if (!gs_cb) {
- gs_cb = kzalloc_obj(*gs_cb, GFP_KERNEL);
+ gs_cb = kzalloc_obj(*gs_cb);
if (!gs_cb)
return -ENOMEM;
current->thread.gs_bc_cb = gs_cb;
diff --git a/arch/s390/kernel/os_info.c b/arch/s390/kernel/os_info.c
index 37ab1c671b4d..4a30c10ae63b 100644
--- a/arch/s390/kernel/os_info.c
+++ b/arch/s390/kernel/os_info.c
@@ -154,7 +154,7 @@ static void os_info_old_init(void)
goto fail;
if (addr == 0 || addr % PAGE_SIZE)
goto fail;
- os_info_old = kzalloc_obj(*os_info_old, GFP_KERNEL);
+ os_info_old = kzalloc_obj(*os_info_old);
if (!os_info_old)
goto fail;
if (copy_oldmem_kernel(os_info_old, addr, sizeof(*os_info_old)))
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 0c4074e717d4..7aa655664ecc 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -252,7 +252,7 @@ static int cpum_cf_alloc_cpu(int cpu)
cpuhw = p->cpucf;
if (!cpuhw) {
- cpuhw = kzalloc_obj(*cpuhw, GFP_KERNEL);
+ cpuhw = kzalloc_obj(*cpuhw);
if (cpuhw) {
p->cpucf = cpuhw;
refcount_set(&cpuhw->refcnt, 1);
@@ -1616,7 +1616,7 @@ static long cfset_ioctl_start(unsigned long arg, struct file *file)
if (!start.counter_sets)
return -EINVAL; /* No counter set at all? */
- preq = kzalloc_obj(*preq, GFP_KERNEL);
+ preq = kzalloc_obj(*preq);
if (!preq)
return -ENOMEM;
cpumask_clear(&preq->mask);
diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c
index eb067beb5c51..ad8c32f0aaed 100644
--- a/arch/s390/kernel/perf_cpum_cf_events.c
+++ b/arch/s390/kernel/perf_cpum_cf_events.c
@@ -976,7 +976,7 @@ static __init struct attribute **merge_attr(struct attribute **a,
j++;
j++;
- new = kmalloc_objs(struct attribute *, j, GFP_KERNEL);
+ new = kmalloc_objs(struct attribute *, j);
if (!new)
return NULL;
j = 0;
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index d0adeabfce0c..c92c29de725e 100644
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1609,7 +1609,7 @@ static void *aux_buffer_setup(struct perf_event *event, void **pages,
}
/* Allocate aux_buffer struct for the event */
- aux = kzalloc_obj(struct aux_buffer, GFP_KERNEL);
+ aux = kzalloc_obj(struct aux_buffer);
if (!aux)
goto no_aux;
sfb = &aux->sfb;
diff --git a/arch/s390/kernel/perf_pai.c b/arch/s390/kernel/perf_pai.c
index 4c2ce0a2a8e4..8fd3e47307a3 100644
--- a/arch/s390/kernel/perf_pai.c
+++ b/arch/s390/kernel/perf_pai.c
@@ -252,7 +252,7 @@ static int pai_alloc_cpu(struct perf_event *event, int cpu)
cpump = mp->mapptr;
if (!cpump) { /* Paicrypt_map allocated? */
rc = -ENOMEM;
- cpump = kzalloc_obj(*cpump, GFP_KERNEL);
+ cpump = kzalloc_obj(*cpump);
if (!cpump)
goto undo;
/* Allocate memory for counter page and counter extraction.
@@ -315,7 +315,7 @@ static int pai_alloc(struct perf_event *event)
struct cpumask *maskptr;
int cpu, rc = -ENOMEM;
- maskptr = kzalloc_obj(*maskptr, GFP_KERNEL);
+ maskptr = kzalloc_obj(*maskptr);
if (!maskptr)
goto out;
@@ -1070,7 +1070,7 @@ static struct attribute * __init attr_event_init_one(int num,
{
struct perf_pmu_events_attr *pa;
- pa = kzalloc_obj(*pa, GFP_KERNEL);
+ pa = kzalloc_obj(*pa);
if (!pa)
return NULL;
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 3a08f8f6c865..125ca4c4e30c 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -749,7 +749,7 @@ static int s390_gs_cb_set(struct task_struct *target,
if (!cpu_has_gs())
return -ENODEV;
if (!target->thread.gs_cb) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
}
@@ -800,7 +800,7 @@ static int s390_gs_bc_set(struct task_struct *target,
if (!cpu_has_gs())
return -ENODEV;
if (!data) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
target->thread.gs_bc_cb = data;
@@ -861,7 +861,7 @@ static int s390_runtime_instr_set(struct task_struct *target,
return -ENODEV;
if (!target->thread.ri_cb) {
- data = kzalloc_obj(*data, GFP_KERNEL);
+ data = kzalloc_obj(*data);
if (!data)
return -ENOMEM;
}
diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c
index 0331ee7af39d..928bff8fcd4a 100644
--- a/arch/s390/kernel/runtime_instr.c
+++ b/arch/s390/kernel/runtime_instr.c
@@ -83,7 +83,7 @@ SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
return -EINVAL;
if (!current->thread.ri_cb) {
- cb = kzalloc_obj(*cb, GFP_KERNEL);
+ cb = kzalloc_obj(*cb);
if (!cb)
return -ENOMEM;
} else {
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 615b76a7f2a0..50bb499cf3e5 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1145,7 +1145,7 @@ int __ref smp_rescan_cpus(bool early)
struct sclp_core_info *info;
int nr;
- info = kzalloc_obj(*info, GFP_KERNEL);
+ info = kzalloc_obj(*info);
if (!info)
return -ENOMEM;
smp_get_core_info(info, 0);
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 1838a4696747..0fe616c49fcc 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -132,7 +132,7 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)
struct page **pagelist;
int i;
- pagelist = kzalloc_objs(struct page *, pages + 1, GFP_KERNEL);
+ pagelist = kzalloc_objs(struct page *, pages + 1);
if (!pagelist)
panic("%s: Cannot allocate page list for VDSO", __func__);
for (i = 0; i < pages; i++)
diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
index 2ac911e388bd..fc80495027ba 100644
--- a/arch/s390/kvm/pci.c
+++ b/arch/s390/kvm/pci.c
@@ -54,7 +54,7 @@ static int zpci_setup_aipb(u8 nisc)
struct page *page;
int size, rc;
- zpci_aipb = kzalloc_obj(union zpci_sic_iib, GFP_KERNEL);
+ zpci_aipb = kzalloc_obj(union zpci_sic_iib);
if (!zpci_aipb)
return -ENOMEM;
@@ -404,7 +404,7 @@ static int kvm_s390_pci_dev_open(struct zpci_dev *zdev)
{
struct kvm_zdev *kzdev;
- kzdev = kzalloc_obj(struct kvm_zdev, GFP_KERNEL);
+ kzdev = kzalloc_obj(struct kvm_zdev);
if (!kzdev)
return -ENOMEM;
@@ -666,7 +666,7 @@ int __init kvm_s390_pci_init(void)
if (!kvm_s390_pci_interp_allowed())
return 0;
- aift = kzalloc_obj(struct zpci_aift, GFP_KERNEL);
+ aift = kzalloc_obj(struct zpci_aift);
if (!aift)
return -ENOMEM;
diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
index fd34a2f46ce3..c2dafd812a3b 100644
--- a/arch/s390/kvm/pv.c
+++ b/arch/s390/kvm/pv.c
@@ -466,7 +466,7 @@ int kvm_s390_pv_set_aside(struct kvm *kvm, u16 *rc, u16 *rrc)
if (kvm->arch.gmap->asce.dt == TABLE_TYPE_SEGMENT)
return -EINVAL;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index db1ef34ad03e..1c3a1eed4381 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -317,7 +317,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
goto out_free;
}
- seg->res = kzalloc_obj(struct resource, GFP_KERNEL);
+ seg->res = kzalloc_obj(struct resource);
if (seg->res == NULL) {
rc = -ENOMEM;
goto out_free;
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 582afb486093..bf92964246eb 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -2323,7 +2323,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
jit_data = fp->aux->jit_data;
if (!jit_data) {
- jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+ jit_data = kzalloc_obj(*jit_data);
if (!jit_data) {
fp = orig_fp;
goto out;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index b75065130639..0ae82e529c21 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -523,7 +523,7 @@ static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start,
{
struct resource *r;
- r = kzalloc_obj(*r, GFP_KERNEL);
+ r = kzalloc_obj(*r);
if (!r)
return NULL;
@@ -824,7 +824,7 @@ struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state)
struct zpci_dev *zdev;
int rc;
- zdev = kzalloc_obj(*zdev, GFP_KERNEL);
+ zdev = kzalloc_obj(*zdev);
if (!zdev)
return ERR_PTR(-ENOMEM);
diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 3eba87a036b1..36a4807285fa 100644
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -315,7 +315,7 @@ static struct zpci_bus *zpci_bus_alloc(int topo, bool topo_is_tid)
{
struct zpci_bus *zbus;
- zbus = kzalloc_obj(*zbus, GFP_KERNEL);
+ zbus = kzalloc_obj(*zbus);
if (!zbus)
return NULL;
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index 441356767437..9c9ed3d8d959 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -563,7 +563,7 @@ static int __init zpci_directed_irq_init(void)
iib.diib.disb_addr = virt_to_phys(zpci_sbv->vector);
zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &iib);
- zpci_ibv = kzalloc_objs(*zpci_ibv, num_possible_cpus(), GFP_KERNEL);
+ zpci_ibv = kzalloc_objs(*zpci_ibv, num_possible_cpus());
if (!zpci_ibv)
return -ENOMEM;
@@ -589,7 +589,7 @@ static int __init zpci_directed_irq_init(void)
static int __init zpci_floating_irq_init(void)
{
- zpci_ibv = kzalloc_objs(*zpci_ibv, ZPCI_NR_DEVICES, GFP_KERNEL);
+ zpci_ibv = kzalloc_objs(*zpci_ibv, ZPCI_NR_DEVICES);
if (!zpci_ibv)
return -ENOMEM;