Merge branch 'for-5.15-verbose-console' into for-linus

[linux-2.6-microblaze.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index 6e6c8e0..6810276 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -130,7 +130,7 @@ static void msg_rcu_free(struct rcu_head *head)
        struct msg_queue *msq = container_of(p, struct msg_queue, q_perm);
 
        security_msg_queue_free(&msq->q_perm);
-       kvfree(msq);
+       kfree(msq);
 }
 
 /**
@@ -147,7 +147,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
        key_t key = params->key;
        int msgflg = params->flg;
 
-       msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
+       msq = kmalloc(sizeof(*msq), GFP_KERNEL);
        if (unlikely(!msq))
                return -ENOMEM;
 
@@ -157,7 +157,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
        msq->q_perm.security = NULL;
        retval = security_msg_queue_alloc(&msq->q_perm);
        if (retval) {
-               kvfree(msq);
+               kfree(msq);
                return retval;
        }