diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/Kconfig | 1 | ||||
-rw-r--r-- | arch/um/kernel/process_kern.c | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index b8e952c88f..9469e77303 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -74,6 +74,7 @@ config MODE_SKAS | |||
74 | option will shrink the UML binary slightly. | 74 | option will shrink the UML binary slightly. |
75 | 75 | ||
76 | source "arch/um/Kconfig_arch" | 76 | source "arch/um/Kconfig_arch" |
77 | source "mm/Kconfig" | ||
77 | 78 | ||
78 | config LD_SCRIPT_STATIC | 79 | config LD_SCRIPT_STATIC |
79 | bool | 80 | bool |
diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c index 804c6bbdf6..157584ae47 100644 --- a/arch/um/kernel/process_kern.c +++ b/arch/um/kernel/process_kern.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include "linux/kernel.h" | 8 | #include "linux/kernel.h" |
9 | #include "linux/sched.h" | 9 | #include "linux/sched.h" |
10 | #include "linux/interrupt.h" | 10 | #include "linux/interrupt.h" |
11 | #include "linux/string.h" | ||
11 | #include "linux/mm.h" | 12 | #include "linux/mm.h" |
12 | #include "linux/slab.h" | 13 | #include "linux/slab.h" |
13 | #include "linux/utsname.h" | 14 | #include "linux/utsname.h" |
@@ -322,12 +323,7 @@ void do_uml_exitcalls(void) | |||
322 | 323 | ||
323 | char *uml_strdup(char *string) | 324 | char *uml_strdup(char *string) |
324 | { | 325 | { |
325 | char *new; | 326 | return kstrdup(string, GFP_KERNEL); |
326 | |||
327 | new = kmalloc(strlen(string) + 1, GFP_KERNEL); | ||
328 | if(new == NULL) return(NULL); | ||
329 | strcpy(new, string); | ||
330 | return(new); | ||
331 | } | 327 | } |
332 | 328 | ||
333 | int copy_to_user_proc(void __user *to, void *from, int size) | 329 | int copy_to_user_proc(void __user *to, void *from, int size) |