diff options
Diffstat (limited to 'arch/um/drivers/slip_user.c')
-rw-r--r-- | arch/um/drivers/slip_user.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index 7eddacc53b6e..78f0e515da8f 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <sys/termios.h> | 8 | #include <sys/termios.h> |
9 | #include <sys/wait.h> | 9 | #include <sys/wait.h> |
10 | #include <sys/signal.h> | 10 | #include <sys/signal.h> |
11 | #include "user_util.h" | ||
12 | #include "kern_util.h" | 11 | #include "kern_util.h" |
13 | #include "user.h" | 12 | #include "user.h" |
14 | #include "net_user.h" | 13 | #include "net_user.h" |
@@ -16,12 +15,14 @@ | |||
16 | #include "slip_common.h" | 15 | #include "slip_common.h" |
17 | #include "os.h" | 16 | #include "os.h" |
18 | #include "um_malloc.h" | 17 | #include "um_malloc.h" |
18 | #include "kern_constants.h" | ||
19 | 19 | ||
20 | void slip_user_init(void *data, void *dev) | 20 | static int slip_user_init(void *data, void *dev) |
21 | { | 21 | { |
22 | struct slip_data *pri = data; | 22 | struct slip_data *pri = data; |
23 | 23 | ||
24 | pri->dev = dev; | 24 | pri->dev = dev; |
25 | return 0; | ||
25 | } | 26 | } |
26 | 27 | ||
27 | static int set_up_tty(int fd) | 28 | static int set_up_tty(int fd) |
@@ -89,7 +90,7 @@ static int slip_tramp(char **argv, int fd) | |||
89 | goto out_close; | 90 | goto out_close; |
90 | pid = err; | 91 | pid = err; |
91 | 92 | ||
92 | output_len = page_size(); | 93 | output_len = UM_KERN_PAGE_SIZE; |
93 | output = um_kmalloc(output_len); | 94 | output = um_kmalloc(output_len); |
94 | if(output == NULL){ | 95 | if(output == NULL){ |
95 | printk("slip_tramp : failed to allocate output buffer\n"); | 96 | printk("slip_tramp : failed to allocate output buffer\n"); |