summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c6
-rw-r--r--ipc/sem.c2
-rw-r--r--ipc/shm.c2
-rw-r--r--ipc/util.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a90aa6803f1b..4798b375972b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -449,7 +449,7 @@ static int mqueue_init_fs_context(struct fs_context *fc)
{
struct mqueue_fs_context *ctx;
- ctx = kzalloc_obj(struct mqueue_fs_context, GFP_KERNEL);
+ ctx = kzalloc_obj(struct mqueue_fs_context);
if (!ctx)
return -ENOMEM;
@@ -1088,7 +1088,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
* fall back to that if necessary.
*/
if (!info->node_cache)
- new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
+ new_leaf = kmalloc_obj(*new_leaf);
spin_lock(&info->lock);
@@ -1181,7 +1181,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
* fall back to that if necessary.
*/
if (!info->node_cache)
- new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
+ new_leaf = kmalloc_obj(*new_leaf);
spin_lock(&info->lock);
diff --git a/ipc/sem.c b/ipc/sem.c
index 2a19244cff22..6cdf862b1f5c 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2234,7 +2234,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
return -EINVAL;
if (nsops > SEMOPM_FAST) {
- sops = kvmalloc_objs(*sops, nsops, GFP_KERNEL);
+ sops = kvmalloc_objs(*sops, nsops);
if (sops == NULL)
return -ENOMEM;
}
diff --git a/ipc/shm.c b/ipc/shm.c
index b94248570304..a95dae447707 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1618,7 +1618,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
rcu_read_unlock();
err = -ENOMEM;
- sfd = kzalloc_obj(*sfd, GFP_KERNEL);
+ sfd = kzalloc_obj(*sfd);
if (!sfd) {
fput(base);
goto out_nattch;
diff --git a/ipc/util.c b/ipc/util.c
index 59235ffba0d9..9eb89820594e 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -141,7 +141,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
struct proc_dir_entry *pde;
struct ipc_proc_iface *iface;
- iface = kmalloc_obj(*iface, GFP_KERNEL);
+ iface = kmalloc_obj(*iface);
if (!iface)
return;
iface->path = path;