Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / um / drivers / net_user.c

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 3503cff867c34d1166466c5da5acc6a14de3f46d..da946e3e1bf26322a3d7078c53868ca005378ec2 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -187,7 +187,7 @@ static int change_tramp(char **argv, char *output, int output_len)
        }
        pe_data.close_me = fds[0];
        pe_data.stdout = fds[1];
-       pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
+       pid = run_helper(change_pre_exec, &pe_data, argv);
 
        if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
                read_output(fds[0], output, output_len);
@@ -217,7 +217,7 @@ static void change(char *dev, char *what, unsigned char *addr,
                netmask[2], netmask[3]);
 
        output_len = UM_KERN_PAGE_SIZE;
-       output = um_kmalloc(output_len);
+       output = kmalloc(output_len, UM_GFP_KERNEL);
        if(output == NULL)
                printk("change : failed to allocate output buffer\n");