Merge tag 'printk-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[linux-2.6-block.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a8d0a58deebc708b08574bee0e29bbbe5ff961b1..9e5dfb1896a95d1cc7815a706ce652ca1ce070ef 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -847,7 +847,7 @@ static int devkmsg_open(struct inode *inode, struct file *file)
                        return err;
        }
 
-       user = kmalloc(sizeof(struct devkmsg_user), GFP_KERNEL);
+       user = kvmalloc(sizeof(struct devkmsg_user), GFP_KERNEL);
        if (!user)
                return -ENOMEM;
 
@@ -875,7 +875,7 @@ static int devkmsg_release(struct inode *inode, struct file *file)
        ratelimit_state_exit(&user->rs);
 
        mutex_destroy(&user->lock);
-       kfree(user);
+       kvfree(user);
        return 0;
 }
 
@@ -2066,6 +2066,7 @@ u16 printk_parse_prefix(const char *text, int *level,
        return prefix_len;
 }
 
+__printf(5, 0)
 static u16 printk_sprint(char *text, u16 size, int facility,
                         enum printk_info_flags *flags, const char *fmt,
                         va_list args)