diff options
author | Greg Dietsche <Gregory.Dietsche@cuw.edu> | 2012-01-15 15:44:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-08 19:47:50 -0500 |
commit | 28aa41fb8d555b120edefd7fdf879b156a1c9f3a (patch) | |
tree | d653d9980687fc53342db058e7713dcbc9616502 | |
parent | e96045a7c837200e65c9fa8f8a94020bc2107931 (diff) |
staging: android: ram_console use kmemdup instead of kmalloc
Replace kmalloc + memcpy will kmemdup in ram_console_late_init
Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/ram_console.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index 6d4d67924f2..0cb3f3c227f 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) | |||
411 | if (ram_console_old_log == NULL) | 411 | if (ram_console_old_log == NULL) |
412 | return 0; | 412 | return 0; |
413 | #ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT | 413 | #ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT |
414 | ram_console_old_log = kmalloc(ram_console_old_log_size, GFP_KERNEL); | 414 | ram_console_old_log = kmemdup(ram_console_old_log_init_buffer, |
415 | ram_console_old_log_size, GFP_KERNEL); | ||
415 | if (ram_console_old_log == NULL) { | 416 | if (ram_console_old_log == NULL) { |
416 | printk(KERN_ERR | 417 | printk(KERN_ERR |
417 | "ram_console: failed to allocate buffer for old log\n"); | 418 | "ram_console: failed to allocate buffer for old log\n"); |
418 | ram_console_old_log_size = 0; | 419 | ram_console_old_log_size = 0; |
419 | return 0; | 420 | return 0; |
420 | } | 421 | } |
421 | memcpy(ram_console_old_log, | ||
422 | ram_console_old_log_init_buffer, ram_console_old_log_size); | ||
423 | #endif | 422 | #endif |
424 | entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); | 423 | entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); |
425 | if (!entry) { | 424 | if (!entry) { |