[PATCH] uml: use kstrdup
There were a bunch of calls to uml_strdup dating from before kstrdup was
introduced. This changes those calls. It doesn't eliminate the definition
since there is still a couple of calls in userspace code (which should
probably call the libc strdup).
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index e0fdffa..c31fc54 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -562,10 +562,11 @@
int line_config(struct line *lines, unsigned int num, char *str)
{
- char *new = uml_strdup(str);
+ char *new;
+ new = kstrdup(str, GFP_KERNEL);
if(new == NULL){
- printk("line_config - uml_strdup failed\n");
+ printk("line_config - kstrdup failed\n");
return -ENOMEM;
}
return !line_setup(lines, num, new, 0);
@@ -677,10 +678,9 @@
INIT_LIST_HEAD(&line->chan_list);
spin_lock_init(&line->lock);
if(line->init_str != NULL){
- line->init_str = uml_strdup(line->init_str);
+ line->init_str = kstrdup(line->init_str, GFP_KERNEL);
if(line->init_str == NULL)
- printk("lines_init - uml_strdup returned "
- "NULL\n");
+ printk("lines_init - kstrdup returned NULL\n");
}
}
}