uml: out of tmpfs space error clarification

[sfrench/cifs-2.6.git] / arch / um / drivers / slip_user.c

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 89fbec185cc16ec10d2d8df49410cf8bb32080a1..78f0e515da8f792ca57334d6ea1a5f26c0657638 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -8,19 +8,21 @@
 #include <sys/termios.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "net_user.h"
 #include "slip.h"
 #include "slip_common.h"
 #include "os.h"
+#include "um_malloc.h"
+#include "kern_constants.h"
 
-void slip_user_init(void *data, void *dev)
+static int slip_user_init(void *data, void *dev)
 {
        struct slip_data *pri = data;
 
        pri->dev = dev;
+       return 0;
 }
 
 static int set_up_tty(int fd)
@@ -88,7 +90,7 @@ static int slip_tramp(char **argv, int fd)
                goto out_close;
        pid = err;
 
-       output_len = page_size();
+       output_len = UM_KERN_PAGE_SIZE;
        output = um_kmalloc(output_len);
        if(output == NULL){
                printk("slip_tramp : failed to allocate output buffer\n");
@@ -241,7 +243,7 @@ static void slip_del_addr(unsigned char *addr, unsigned char *netmask,
        close_addr(addr, netmask, pri->name);
 }
 
-struct net_user_info slip_user_info = {
+const struct net_user_info slip_user_info = {
        .init           = slip_user_init,
        .open           = slip_open,
        .close          = slip_close,