OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Jeff Dike 2006-01-06 00:18:48 -08:00 committed by Linus Torvalds
parent 118c1f27b8
commit 970d6e3a34
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/um/drivers/line.c
View File

@ -562,10 +562,11 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
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 @@ void lines_init(struct line *lines, int nlines)
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");
}
}
}

2
arch/um/drivers/mconsole_kern.c
View File

@ -563,7 +563,7 @@ int mconsole_init(void)
}
if(notify_socket != NULL){
notify_socket = uml_strdup(notify_socket);
notify_socket = kstrdup(notify_socket, GFP_KERNEL);
if(notify_socket != NULL)
mconsole_notify(notify_socket, MCONSOLE_SOCKET,
mconsole_socket_name,

2
arch/um/drivers/net_kern.c
View File

@ -586,7 +586,7 @@ static int net_config(char *str)
err = eth_parse(str, &n, &str);
if(err) return(err);
str = uml_strdup(str);
str = kstrdup(str, GFP_KERNEL);
if(str == NULL){
printk(KERN_ERR "net_config failed to strdup string\n");
return(-1);

2
arch/um/drivers/ubd_kern.c
View File

@ -706,7 +706,7 @@ static int ubd_config(char *str)
{
int n, err;
str = uml_strdup(str);
str = kstrdup(str, GFP_KERNEL);
if(str == NULL){
printk(KERN_ERR "ubd_config failed to strdup string\n");
return(1);