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>
int line_config(struct line *lines, unsigned int num, char *str)
{
int line_config(struct line *lines, unsigned int num, char *str)
{
- char *new = uml_strdup(str);
+ new = kstrdup(str, GFP_KERNEL);
- printk("line_config - uml_strdup failed\n");
+ printk("line_config - kstrdup failed\n");
return -ENOMEM;
}
return !line_setup(lines, num, new, 0);
return -ENOMEM;
}
return !line_setup(lines, num, new, 0);
INIT_LIST_HEAD(&line->chan_list);
spin_lock_init(&line->lock);
if(line->init_str != NULL){
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)
if(line->init_str == NULL)
- printk("lines_init - uml_strdup returned "
- "NULL\n");
+ printk("lines_init - kstrdup returned NULL\n");
}
if(notify_socket != NULL){
}
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,
if(notify_socket != NULL)
mconsole_notify(notify_socket, MCONSOLE_SOCKET,
mconsole_socket_name,
err = eth_parse(str, &n, &str);
if(err) return(err);
err = eth_parse(str, &n, &str);
if(err) return(err);
+ str = kstrdup(str, GFP_KERNEL);
if(str == NULL){
printk(KERN_ERR "net_config failed to strdup string\n");
return(-1);
if(str == NULL){
printk(KERN_ERR "net_config failed to strdup string\n");
return(-1);
+ str = kstrdup(str, GFP_KERNEL);
if(str == NULL){
printk(KERN_ERR "ubd_config failed to strdup string\n");
return(1);
if(str == NULL){
printk(KERN_ERR "ubd_config failed to strdup string\n");
return(1);