From 28aa41fb8d555b120edefd7fdf879b156a1c9f3a Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Sun, 15 Jan 2012 14:44:34 -0600 Subject: [PATCH] staging: android: ram_console use kmemdup instead of kmalloc Replace kmalloc + memcpy will kmemdup in ram_console_late_init Signed-off-by: Greg Dietsche Signed-off-by: Greg Kroah-Hartman --- drivers/staging/android/ram_console.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index 6d4d67924f22..0cb3f3c227fc 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c @@ -411,15 +411,14 @@ static int __init ram_console_late_init(void) if (ram_console_old_log == NULL) return 0; #ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT - ram_console_old_log = kmalloc(ram_console_old_log_size, GFP_KERNEL); + ram_console_old_log = kmemdup(ram_console_old_log_init_buffer, + ram_console_old_log_size, GFP_KERNEL); if (ram_console_old_log == NULL) { printk(KERN_ERR "ram_console: failed to allocate buffer for old log\n"); ram_console_old_log_size = 0; return 0; } - memcpy(ram_console_old_log, - ram_console_old_log_init_buffer, ram_console_old_log_size); #endif entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); if (!entry) { -- 2.11.0