Merge with /home/shaggy/git/linus-clean/

26 files changed, 267 insertions, 309 deletions

diff --git a/arch/um/Kconfig_char b/arch/um/Kconfig_char
index 3e50fdb67626..62d87b71179b 100644
--- a/arch/um/Kconfig_char
+++ b/arch/um/Kconfig_char
@@ -204,5 +204,11 @@ config UML_RANDOM
         http://sourceforge.net/projects/gkernel/).  rngd periodically reads
         /dev/hwrng and injects the entropy into /dev/random.
 
+config MMAPPER
+        tristate "iomem emulation driver"
+        help
+        This driver allows a host file to be used as emulated IO memory inside
+        UML.
+
 endmenu
 
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index 323f72c64cd2..b2de9916c32c 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -22,8 +22,8 @@ obj-y := stdio_console.o fd.o chan_kern.o chan_user.o line.o
 obj-$(CONFIG_SSL) += ssl.o
 obj-$(CONFIG_STDERR_CONSOLE) += stderr_console.o
 
-obj-$(CONFIG_UML_NET_SLIP) += slip.o
-obj-$(CONFIG_UML_NET_SLIRP) += slirp.o
+obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
+obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
 obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
 #obj-$(CONFIG_UML_NET_PCAP) += pcap.o $(PCAP)
@@ -41,6 +41,6 @@ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
 obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
 obj-$(CONFIG_UML_RANDOM) += random.o
 
-USER_OBJS := fd.o null.o pty.o tty.o xterm.o
+USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o
 
 include arch/um/scripts/Makefile.rules
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 583b8e137c33..5d3768156c92 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -143,22 +143,22 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
 {
         struct winch_data data;
         unsigned long stack;
-        int fds[2], pid, n, err;
+        int fds[2], n, err;
         char c;
 
         err = os_pipe(fds, 1, 1);
         if(err < 0){
                 printk("winch_tramp : os_pipe failed, err = %d\n", -err);
-                return(err);
+                goto out;
         }
 
         data = ((struct winch_data) { .pty_fd           = fd,
                                       .pipe_fd          = fds[1],
                                       .close_me         = fds[0] } );
-        pid = run_helper_thread(winch_thread, &data, 0, &stack, 0);
-        if(pid < 0){
+        err = run_helper_thread(winch_thread, &data, 0, &stack, 0);
+        if(err < 0){
                 printk("fork of winch_thread failed - errno = %d\n", errno);
-                return(pid);
+                goto out_close;
         }
 
         os_close_file(fds[1]);
@@ -168,14 +168,22 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
                 printk("winch_tramp : failed to read synchronization byte\n");
                 printk("read failed, err = %d\n", -n);
                 printk("fd %d will not support SIGWINCH\n", fd);
-                *fd_out = -1;
+                err = -EINVAL;
+                goto out_close1;
         }
-        return(pid);
+        return err ;
+
+ out_close:
+        os_close_file(fds[1]);
+ out_close1:
+        os_close_file(fds[0]);
+ out:
+        return err;
 }
 
 void register_winch(int fd, struct tty_struct *tty)
 {
-        int pid, thread, thread_fd;
+        int pid, thread, thread_fd = -1;
         int count;
         char c = 1;
 
@@ -186,7 +194,7 @@ void register_winch(int fd, struct tty_struct *tty)
         if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd,
                              tty) && (pid == -1)){
                 thread = winch_tramp(fd, tty, &thread_fd);
-                if(fd != -1){
+                if(thread > 0){
                         register_winch_irq(thread_fd, fd, thread, tty);
 
                         count = os_write_file(thread_fd, &c, sizeof(c));
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index a63231dffe05..a37a5ac13c22 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/init.h> 
 #include <linux/smp_lock.h>
+#include <linux/miscdevice.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
@@ -117,24 +118,39 @@ static struct file_operations mmapper_fops = {
         .release        = mmapper_release,
 };
 
+static struct miscdevice mmapper_dev = {
+        .minor          = MISC_DYNAMIC_MINOR,
+        .name           = "mmapper",
+        .fops           = &mmapper_fops
+};
+
 static int __init mmapper_init(void)
 {
+        int err;
+
         printk(KERN_INFO "Mapper v0.1\n");
 
         v_buf = (char *) find_iomem("mmapper", &mmapper_size);
         if(mmapper_size == 0){
                 printk(KERN_ERR "mmapper_init - find_iomem failed\n");
-                return(0);
+                goto out;
         }
 
-        p_buf = __pa(v_buf);
+        err = misc_register(&mmapper_dev);
+        if(err){
+                printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
+                       err);
+                goto out;
+        }
 
-        devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUGO|S_IWUGO, "mmapper");
-        return(0);
+        p_buf = __pa(v_buf);
+out:
+        return 0;
 }
 
 static void mmapper_exit(void)
 {
+        misc_deregister(&mmapper_dev);
 }
 
 module_init(mmapper_init);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 47229fe4a813..3730d4f12713 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -32,7 +32,7 @@ int tap_open_common(void *dev, char *gate_addr)
         return(0);
 }
 
-void tap_check_ips(char *gate_addr, char *eth_addr)
+void tap_check_ips(char *gate_addr, unsigned char *eth_addr)
 {
         int tap_addr[4];
 
diff --git a/arch/um/drivers/slip.h b/arch/um/drivers/slip.h
index 495f2f1b1420..bb0dab41c2e4 100644
--- a/arch/um/drivers/slip.h
+++ b/arch/um/drivers/slip.h
@@ -1,10 +1,7 @@
 #ifndef __UM_SLIP_H
 #define __UM_SLIP_H
 
-#define BUF_SIZE 1500
- /* two bytes each for a (pathological) max packet of escaped chars +  * 
-  * terminating END char + initial END char                            */
-#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
+#include "slip_common.h"
 
 struct slip_data {
         void *dev;
@@ -12,28 +9,12 @@ struct slip_data {
         char *addr;
         char *gate_addr;
         int slave;
-        char ibuf[ENC_BUF_SIZE];
-        char obuf[ENC_BUF_SIZE];
-        int more; /* more data: do not read fd until ibuf has been drained */
-        int pos;
-        int esc;
+        struct slip_proto slip;
 };
 
 extern struct net_user_info slip_user_info;
 
-extern int set_umn_addr(int fd, char *addr, char *ptp_addr);
 extern int slip_user_read(int fd, void *buf, int len, struct slip_data *pri);
 extern int slip_user_write(int fd, void *buf, int len, struct slip_data *pri);
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slip_common.c b/arch/um/drivers/slip_common.c
new file mode 100644
index 000000000000..e89cfc68fc3e
--- /dev/null
+++ b/arch/um/drivers/slip_common.c
@@ -0,0 +1,54 @@
+#include <string.h>
+#include "slip_common.h"
+#include "net_user.h"
+
+int slip_proto_read(int fd, void *buf, int len, struct slip_proto *slip)
+{
+        int i, n, size, start;
+
+        if(slip->more > 0){
+                i = 0;
+                while(i < slip->more){
+                        size = slip_unesc(slip->ibuf[i++], slip->ibuf,
+                                          &slip->pos, &slip->esc);
+                        if(size){
+                                memcpy(buf, slip->ibuf, size);
+                                memmove(slip->ibuf, &slip->ibuf[i],
+                                        slip->more - i);
+                                slip->more = slip->more - i;
+                                return size;
+                        }
+                }
+                slip->more = 0;
+        }
+
+        n = net_read(fd, &slip->ibuf[slip->pos],
+                     sizeof(slip->ibuf) - slip->pos);
+        if(n <= 0)
+                return n;
+
+        start = slip->pos;
+        for(i = 0; i < n; i++){
+                size = slip_unesc(slip->ibuf[start + i], slip->ibuf,&slip->pos,
+                                  &slip->esc);
+                if(size){
+                        memcpy(buf, slip->ibuf, size);
+                        memmove(slip->ibuf, &slip->ibuf[start+i+1],
+                                n - (i + 1));
+                        slip->more = n - (i + 1);
+                        return size;
+                }
+        }
+        return 0;
+}
+
+int slip_proto_write(int fd, void *buf, int len, struct slip_proto *slip)
+{
+        int actual, n;
+
+        actual = slip_esc(buf, slip->obuf, len);
+        n = net_write(fd, slip->obuf, actual);
+        if(n < 0)
+                return n;
+        else return len;
+}
diff --git a/arch/um/drivers/slip_proto.h b/arch/um/drivers/slip_common.h
index 7206361ace45..2ae76d8f1be1 100644
--- a/arch/um/drivers/slip_proto.h
+++ b/arch/um/drivers/slip_common.h
@@ -1,10 +1,10 @@
-/* 
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
+#ifndef __UM_SLIP_COMMON_H
+#define __UM_SLIP_COMMON_H
 
-#ifndef __UM_SLIP_PROTO_H__
-#define __UM_SLIP_PROTO_H__
+#define BUF_SIZE 1500
+ /* two bytes each for a (pathological) max packet of escaped chars +  *
+  * terminating END char + initial END char                            */
+#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
 
 /* SLIP protocol characters. */
 #define SLIP_END             0300       /* indicates end of frame       */
@@ -12,7 +12,8 @@
 #define SLIP_ESC_END         0334       /* ESC ESC_END means END 'data' */
 #define SLIP_ESC_ESC         0335       /* ESC ESC_ESC means ESC 'data' */
 
-static inline int slip_unesc(unsigned char c,char *buf,int *pos, int *esc)
+static inline int slip_unesc(unsigned char c, unsigned char *buf, int *pos,
+                             int *esc)
 {
         int ret;
 
@@ -79,15 +80,25 @@ static inline int slip_esc(unsigned char *s, unsigned char *d, int len)
         return (ptr - d);
 }
 
-#endif
+struct slip_proto {
+        unsigned char ibuf[ENC_BUF_SIZE];
+        unsigned char obuf[ENC_BUF_SIZE];
+        int more; /* more data: do not read fd until ibuf has been drained */
+        int pos;
+        int esc;
+};
+
+#define SLIP_PROTO_INIT { \
+        .ibuf   = { '\0' }, \
+        .obuf   = { '\0' }, \
+        .more   = 0, \
+        .pos    = 0, \
+        .esc    = 0 \
+}
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+extern int slip_proto_read(int fd, void *buf, int len,
+                           struct slip_proto *slip);
+extern int slip_proto_write(int fd, void *buf, int len,
+                            struct slip_proto *slip);
+
+#endif
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 0886eedba213..9a6f5c85f902 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -26,16 +26,16 @@ void slip_init(struct net_device *dev, void *data)
                   .addr         = NULL,
                   .gate_addr    = init->gate_addr,
                   .slave        = -1,
-                  .ibuf         = { '\0' },
-                  .obuf         = { '\0' },
-                  .pos          = 0,
-                  .esc          = 0,
+                  .slip         = SLIP_PROTO_INIT,
                   .dev          = dev });
 
         dev->init = NULL;
+        dev->header_cache_update = NULL;
+        dev->hard_header_cache = NULL;
+        dev->hard_header = NULL;
         dev->hard_header_len = 0;
-        dev->addr_len = 4;
-        dev->type = ARPHRD_ETHER;
+        dev->addr_len = 0;
+        dev->type = ARPHRD_SLIP;
         dev->tx_queue_len = 256;
         dev->flags = IFF_NOARP;
         printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr);
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index d94846b1b4cf..71af444e591f 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -13,7 +13,7 @@
 #include "user.h"
 #include "net_user.h"
 #include "slip.h"
-#include "slip_proto.h"
+#include "slip_common.h"
 #include "helper.h"
 #include "os.h"
 
@@ -77,41 +77,51 @@ static int slip_tramp(char **argv, int fd)
         err = os_pipe(fds, 1, 0);
         if(err < 0){
                 printk("slip_tramp : pipe failed, err = %d\n", -err);
-                return(err);
+                goto out;
         }
 
         err = 0;
         pe_data.stdin = fd;
         pe_data.stdout = fds[1];
         pe_data.close_me = fds[0];
-        pid = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        err = run_helper(slip_pre_exec, &pe_data, argv, NULL);
+        if(err < 0)
+                goto out_close;
+        pid = err;
+
+        output_len = page_size();
+        output = um_kmalloc(output_len);
+        if(output == NULL){
+                printk("slip_tramp : failed to allocate output buffer\n");
+                os_kill_process(pid, 1);
+                err = -ENOMEM;
+                goto out_free;
+        }
 
-        if(pid < 0) err = pid;
-        else {
-                output_len = page_size();
-                output = um_kmalloc(output_len);
-                if(output == NULL)
-                        printk("slip_tramp : failed to allocate output "
-                               "buffer\n");
-
-                os_close_file(fds[1]);
-                read_output(fds[0], output, output_len);
-                if(output != NULL){
-                        printk("%s", output);
-                        kfree(output);
-                }
-                CATCH_EINTR(err = waitpid(pid, &status, 0));
-                if(err < 0)
-                        err = errno;
-                else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
-                        printk("'%s' didn't exit with status 0\n", argv[0]);
-                        err = -EINVAL;
-                }
+        os_close_file(fds[1]);
+        read_output(fds[0], output, output_len);
+        printk("%s", output);
+
+        CATCH_EINTR(err = waitpid(pid, &status, 0));
+        if(err < 0)
+                err = errno;
+        else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
+                printk("'%s' didn't exit with status 0\n", argv[0]);
+                err = -EINVAL;
         }
+        else err = 0;
 
         os_close_file(fds[0]);
 
-        return(err);
+out_free:
+        kfree(output);
+        return err;
+
+out_close:
+        os_close_file(fds[0]);
+        os_close_file(fds[1]);
+out:
+        return err;
 }
 
 static int slip_open(void *data)
@@ -123,21 +133,26 @@ static int slip_open(void *data)
                          NULL };
         int sfd, mfd, err;
 
-        mfd = get_pty();
-        if(mfd < 0){
-                printk("umn : Failed to open pty, err = %d\n", -mfd);
-                return(mfd);
+        err = get_pty();
+        if(err < 0){
+                printk("slip-open : Failed to open pty, err = %d\n", -err);
+                goto out;
         }
-        sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
-        if(sfd < 0){
-                printk("Couldn't open tty for slip line, err = %d\n", -sfd);
-                os_close_file(mfd);
-                return(sfd);
+        mfd = err;
+
+        err = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
+        if(err < 0){
+                printk("Couldn't open tty for slip line, err = %d\n", -err);
+                goto out_close;
         }
-        if(set_up_tty(sfd)) return(-1);
+        sfd = err;
+
+        if(set_up_tty(sfd))
+                goto out_close2;
+
         pri->slave = sfd;
-        pri->pos = 0;
-        pri->esc = 0;
+        pri->slip.pos = 0;
+        pri->slip.esc = 0;
         if(pri->gate_addr != NULL){
                 sprintf(version_buf, "%d", UML_NET_VERSION);
                 strcpy(gate_buf, pri->gate_addr);
@@ -146,12 +161,12 @@ static int slip_open(void *data)
 
                 if(err < 0){
                         printk("slip_tramp failed - err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
                 err = os_get_ifname(pri->slave, pri->name);
                 if(err < 0){
                         printk("get_ifname failed, err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
                 iter_addresses(pri->dev, open_addr, pri->name);
         }
@@ -160,10 +175,16 @@ static int slip_open(void *data)
                 if(err < 0){
                         printk("Failed to set slip discipline encapsulation - "
                                "err = %d\n", -err);
-                        return(err);
+                        goto out_close2;
                 }
         }
         return(mfd);
+out_close2:
+        os_close_file(sfd);
+out_close:
+        os_close_file(mfd);
+out:
+        return err;
 }
 
 static void slip_close(int fd, void *data)
@@ -190,48 +211,12 @@ static void slip_close(int fd, void *data)
 
 int slip_user_read(int fd, void *buf, int len, struct slip_data *pri)
 {
-        int i, n, size, start;
-
-        if(pri->more>0) {
-                i = 0;
-                while(i < pri->more) {
-                        size = slip_unesc(pri->ibuf[i++],
-                                        pri->ibuf, &pri->pos, &pri->esc);
-                        if(size){
-                                memcpy(buf, pri->ibuf, size);
-                                memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
-                                pri->more=pri->more-i; 
-                                return(size);
-                        }
-                }
-                pri->more=0;
-        }
-
-        n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
-        if(n <= 0) return(n);
-
-        start = pri->pos;
-        for(i = 0; i < n; i++){
-                size = slip_unesc(pri->ibuf[start + i],
-                                pri->ibuf, &pri->pos, &pri->esc);
-                if(size){
-                        memcpy(buf, pri->ibuf, size);
-                        memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
-                        pri->more=n-(i+1); 
-                        return(size);
-                }
-        }
-        return(0);
+        return slip_proto_read(fd, buf, len, &pri->slip);
 }
 
 int slip_user_write(int fd, void *buf, int len, struct slip_data *pri)
 {
-        int actual, n;
-
-        actual = slip_esc(buf, pri->obuf, len);
-        n = net_write(fd, pri->obuf, actual);
-        if(n < 0) return(n);
-        else return(len);
+        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
 static int slip_set_mtu(int mtu, void *data)
@@ -267,14 +252,3 @@ struct net_user_info slip_user_info = {
         .delete_address = slip_del_addr,
         .max_packet     = BUF_SIZE
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slirp.h b/arch/um/drivers/slirp.h
index 04e407d1e44a..6cf88ab580c9 100644
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
@@ -1,10 +1,7 @@
 #ifndef __UM_SLIRP_H
 #define __UM_SLIRP_H
 
-#define BUF_SIZE 1500
- /* two bytes each for a (pathological) max packet of escaped chars +  * 
-  * terminating END char + initial END char                            */
-#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
+#include "slip_common.h"
 
 #define SLIRP_MAX_ARGS 100
 /*
@@ -24,28 +21,13 @@ struct slirp_data {
         struct arg_list_dummy_wrapper argw;
         int pid;
         int slave;
-        char ibuf[ENC_BUF_SIZE];
-        char obuf[ENC_BUF_SIZE];
-        int more; /* more data: do not read fd until ibuf has been drained */
-        int pos;
-        int esc;
+        struct slip_proto slip;
 };
 
 extern struct net_user_info slirp_user_info;
 
-extern int set_umn_addr(int fd, char *addr, char *ptp_addr);
 extern int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri);
-extern int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri);
+extern int slirp_user_write(int fd, void *buf, int len,
+                            struct slirp_data *pri);
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index c9d6b52a831d..9864d27afdbe 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -25,10 +25,7 @@ void slirp_init(struct net_device *dev, void *data)
                 { .argw         = init->argw,
                   .pid          = -1,
                   .slave        = -1,
-                  .ibuf         = { '\0' },
-                  .obuf         = { '\0' },
-                  .pos          = 0,
-                  .esc          = 0,
+                  .slip         = SLIP_PROTO_INIT,
                   .dev          = dev });
 
         dev->init = NULL;
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index c322515c71cc..8d91f663d82c 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -12,7 +12,7 @@
 #include "user.h"
 #include "net_user.h"
 #include "slirp.h"
-#include "slip_proto.h"
+#include "slip_common.h"
 #include "helper.h"
 #include "os.h"
 
@@ -48,47 +48,32 @@ static int slirp_tramp(char **argv, int fd)
         return(pid);
 }
 
-/* XXX This is just a trivial wrapper around os_pipe */
-static int slirp_datachan(int *mfd, int *sfd)
-{
-        int fds[2], err;
-
-        err = os_pipe(fds, 1, 1);
-        if(err < 0){
-                printk("slirp_datachan: Failed to open pipe, err = %d\n", -err);
-                return(err);
-        }
-
-        *mfd = fds[0];
-        *sfd = fds[1];
-        return(0);
-}
-
 static int slirp_open(void *data)
 {
         struct slirp_data *pri = data;
-        int sfd, mfd, pid, err;
+        int fds[2], pid, err;
 
-        err = slirp_datachan(&mfd, &sfd);
+        err = os_pipe(fds, 1, 1);
         if(err)
                 return(err);
 
-        pid = slirp_tramp(pri->argw.argv, sfd);
-
-        if(pid < 0){
-                printk("slirp_tramp failed - errno = %d\n", -pid);
-                os_close_file(sfd);     
-                os_close_file(mfd);     
-                return(pid);
+        err = slirp_tramp(pri->argw.argv, fds[1]);
+        if(err < 0){
+                printk("slirp_tramp failed - errno = %d\n", -err);
+                goto out;
         }
-
-        pri->slave = sfd;
-        pri->pos = 0;
-        pri->esc = 0;
-
-        pri->pid = pid;
-
-        return(mfd);
+        pid = err;
+
+        pri->slave = fds[1];
+        pri->slip.pos = 0;
+        pri->slip.esc = 0;
+        pri->pid = err;
+
+        return(fds[0]);
+out:
+        os_close_file(fds[0]);
+        os_close_file(fds[1]);
+        return err;
 }
 
 static void slirp_close(int fd, void *data)
@@ -129,48 +114,12 @@ static void slirp_close(int fd, void *data)
 
 int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri)
 {
-        int i, n, size, start;
-
-        if(pri->more>0) {
-                i = 0;
-                while(i < pri->more) {
-                        size = slip_unesc(pri->ibuf[i++],
-                                        pri->ibuf,&pri->pos,&pri->esc);
-                        if(size){
-                                memcpy(buf, pri->ibuf, size);
-                                memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
-                                pri->more=pri->more-i; 
-                                return(size);
-                        }
-                }
-                pri->more=0;
-        }
-
-        n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
-        if(n <= 0) return(n);
-
-        start = pri->pos;
-        for(i = 0; i < n; i++){
-                size = slip_unesc(pri->ibuf[start + i],
-                                pri->ibuf,&pri->pos,&pri->esc);
-                if(size){
-                        memcpy(buf, pri->ibuf, size);
-                        memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
-                        pri->more=n-(i+1); 
-                        return(size);
-                }
-        }
-        return(0);
+        return slip_proto_read(fd, buf, len, &pri->slip);
 }
 
 int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri)
 {
-        int actual, n;
-
-        actual = slip_esc(buf, pri->obuf, len);
-        n = net_write(fd, pri->obuf, actual);
-        if(n < 0) return(n);
-        else return(len);
+        return slip_proto_write(fd, buf, len, &pri->slip);
 }
 
 static int slirp_set_mtu(int mtu, void *data)
@@ -188,14 +137,3 @@ struct net_user_info slirp_user_info = {
         .delete_address = NULL,
         .max_packet     = BUF_SIZE
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/drivers/stderr_console.c b/arch/um/drivers/stderr_console.c
index 98565b53d170..429ae8e6c7e5 100644
--- a/arch/um/drivers/stderr_console.c
+++ b/arch/um/drivers/stderr_console.c
@@ -22,9 +22,9 @@ static void stderr_console_write(struct console *console, const char *string,
 }
 
 static struct console stderr_console = {
-        .name           "stderr",
-        .write          stderr_console_write,
-        .flags          CON_PRINTBUFFER,
+        .name           = "stderr",
+        .write          = stderr_console_write,
+        .flags          = CON_PRINTBUFFER,
 };
 
 static int __init stderr_console_init(void)
diff --git a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h
index 9fbe3083fdd8..cfa368e045a5 100644
--- a/arch/um/include/mconsole.h
+++ b/arch/um/include/mconsole.h
@@ -56,7 +56,7 @@ struct mc_request
         int as_interrupt;
 
         int originating_fd;
-        int originlen;
+        unsigned int originlen;
         unsigned char origin[128];                      /* sockaddr_un */
 
         struct mconsole_request request;
diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index 36807b796e9f..89885a77a771 100644
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -35,7 +35,7 @@ extern void *get_output_buffer(int *len_out);
 extern void free_output_buffer(void *buffer);
 
 extern int tap_open_common(void *dev, char *gate_addr);
-extern void tap_check_ips(char *gate_addr, char *eth_addr);
+extern void tap_check_ips(char *gate_addr, unsigned char *eth_addr);
 
 extern void read_output(int fd, char *output_out, int len);
 
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index d246d5a24609..881d2988d2d8 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -136,7 +136,7 @@ extern int os_seek_file(int fd, __u64 offset);
 extern int os_open_file(char *file, struct openflags flags, int mode);
 extern int os_read_file(int fd, void *buf, int len);
 extern int os_write_file(int fd, const void *buf, int count);
-extern int os_file_size(char *file, long long *size_out);
+extern int os_file_size(char *file, unsigned long long *size_out);
 extern int os_file_modtime(char *file, unsigned long *modtime);
 extern int os_pipe(int *fd, int stream, int close_on_exec);
 extern int os_set_fd_async(int fd, int owner);
diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h
index 6eaeb9919983..c8ee9559f3ab 100644
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
@@ -8,6 +8,8 @@
 
 #include "uml-config.h"
 #include "user_constants.h"
+#include "sysdep/faultinfo.h"
+#include "choose-mode.h"
 
 #define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long))
 #define MAX_REG_OFFSET (UM_FRAME_SIZE)
@@ -58,9 +60,6 @@ extern int sysemu_supported;
 #define PTRACE_SYSEMU_SINGLESTEP 32
 #endif
 
-#include "sysdep/faultinfo.h"
-#include "choose-mode.h"
-
 union uml_pt_regs {
 #ifdef UML_CONFIG_MODE_TT
         struct tt_regs {
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index b8c5b8a95250..7b6a24dfd302 100644
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -41,9 +41,6 @@ extern unsigned long highmem;
 extern char host_info[];
 
 extern char saved_command_line[];
-extern char command_line[];
-
-extern char *tempdir;
 
 extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
 extern unsigned long _unprotected_end;
diff --git a/arch/um/kernel/main.c b/arch/um/kernel/main.c
index e42e6364ca13..e59f58152678 100644
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
@@ -24,8 +24,6 @@
 #include "mode.h"
 #include "choose-mode.h"
 #include "uml-config.h"
-#include "irq_user.h"
-#include "time_user.h"
 #include "os.h"
 
 /* Set in set_stklim, which is called from main and __wrap_malloc.
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 51f8e5a8ac6a..1b5ef3e96c71 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -30,7 +30,6 @@
 #include "init.h"
 #include "os.h"
 #include "uml-config.h"
-#include "ptrace_user.h"
 #include "choose-mode.h"
 #include "mode.h"
 #ifdef UML_CONFIG_MODE_SKAS
@@ -131,7 +130,7 @@ int start_fork_tramp(void *thread_arg, unsigned long temp_stack,
         return(arg.pid);
 }
 
-static int ptrace_child(void *arg)
+static int ptrace_child(void)
 {
         int ret;
         int pid = os_getpid(), ppid = getppid();
@@ -160,20 +159,16 @@ static int ptrace_child(void *arg)
         _exit(ret);
 }
 
-static int start_ptraced_child(void **stack_out)
+static int start_ptraced_child(void)
 {
-        void *stack;
-        unsigned long sp;
         int pid, n, status;
         
-        stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
-                     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-        if(stack == MAP_FAILED)
-                panic("check_ptrace : mmap failed, errno = %d", errno);
-        sp = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
-        pid = clone(ptrace_child, (void *) sp, SIGCHLD, NULL);
+        pid = fork();
+        if(pid == 0)
+                ptrace_child();
+
         if(pid < 0)
-                panic("check_ptrace : clone failed, errno = %d", errno);
+                panic("check_ptrace : fork failed, errno = %d", errno);
         CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
         if(n < 0)
                 panic("check_ptrace : wait failed, errno = %d", errno);
@@ -181,7 +176,6 @@ static int start_ptraced_child(void **stack_out)
                 panic("check_ptrace : expected SIGSTOP, got status = %d",
                       status);
 
-        *stack_out = stack;
         return(pid);
 }
 
@@ -189,12 +183,12 @@ static int start_ptraced_child(void **stack_out)
  * just avoid using sysemu, not panic, but only if SYSEMU features are broken.
  * So only for SYSEMU features we test mustpanic, while normal host features
  * must work anyway!*/
-static int stop_ptraced_child(int pid, void *stack, int exitcode, int mustpanic)
+static int stop_ptraced_child(int pid, int exitcode, int mustexit)
 {
         int status, n, ret = 0;
 
         if(ptrace(PTRACE_CONT, pid, 0, 0) < 0)
-                panic("check_ptrace : ptrace failed, errno = %d", errno);
+                panic("stop_ptraced_child : ptrace failed, errno = %d", errno);
         CATCH_EINTR(n = waitpid(pid, &status, 0));
         if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
                 int exit_with = WEXITSTATUS(status);
@@ -205,15 +199,13 @@ static int stop_ptraced_child(int pid, void *stack, int exitcode, int mustpanic)
                 printk("check_ptrace : child exited with exitcode %d, while "
                       "expecting %d; status 0x%x", exit_with,
                       exitcode, status);
-                if (mustpanic)
+                if (mustexit)
                         panic("\n");
                 else
                         printk("\n");
                 ret = -1;
         }
 
-        if(munmap(stack, PAGE_SIZE) < 0)
-                panic("check_ptrace : munmap failed, errno = %d", errno);
         return ret;
 }
 
@@ -235,12 +227,11 @@ __uml_setup("nosysemu", nosysemu_cmd_param,
 
 static void __init check_sysemu(void)
 {
-        void *stack;
         int pid, syscall, n, status, count=0;
 
         printk("Checking syscall emulation patch for ptrace...");
         sysemu_supported = 0;
-        pid = start_ptraced_child(&stack);
+        pid = start_ptraced_child();
 
         if(ptrace(PTRACE_SYSEMU, pid, 0, 0) < 0)
                 goto fail;
@@ -258,7 +249,7 @@ static void __init check_sysemu(void)
                 panic("check_sysemu : failed to modify system "
                       "call return, errno = %d", errno);
 
-        if (stop_ptraced_child(pid, stack, 0, 0) < 0)
+        if (stop_ptraced_child(pid, 0, 0) < 0)
                 goto fail_stopped;
 
         sysemu_supported = 1;
@@ -266,7 +257,7 @@ static void __init check_sysemu(void)
         set_using_sysemu(!force_sysemu_disabled);
 
         printk("Checking advanced syscall emulation patch for ptrace...");
-        pid = start_ptraced_child(&stack);
+        pid = start_ptraced_child();
         while(1){
                 count++;
                 if(ptrace(PTRACE_SYSEMU_SINGLESTEP, pid, 0, 0) < 0)
@@ -291,7 +282,7 @@ static void __init check_sysemu(void)
                         break;
                 }
         }
-        if (stop_ptraced_child(pid, stack, 0, 0) < 0)
+        if (stop_ptraced_child(pid, 0, 0) < 0)
                 goto fail_stopped;
 
         sysemu_supported = 2;
@@ -302,18 +293,17 @@ static void __init check_sysemu(void)
         return;
 
 fail:
-        stop_ptraced_child(pid, stack, 1, 0);
+        stop_ptraced_child(pid, 1, 0);
 fail_stopped:
         printk("missing\n");
 }
 
 void __init check_ptrace(void)
 {
-        void *stack;
         int pid, syscall, n, status;
 
         printk("Checking that ptrace can change system call numbers...");
-        pid = start_ptraced_child(&stack);
+        pid = start_ptraced_child();
 
         if (ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
                 panic("check_ptrace: PTRACE_SETOPTIONS failed, errno = %d", errno);
@@ -340,7 +330,7 @@ void __init check_ptrace(void)
                         break;
                 }
         }
-        stop_ptraced_child(pid, stack, 0, 1);
+        stop_ptraced_child(pid, 0, 1);
         printk("OK\n");
         check_sysemu();
 }
@@ -372,11 +362,10 @@ void forward_pending_sigio(int target)
 static inline int check_skas3_ptrace_support(void)
 {
         struct ptrace_faultinfo fi;
-        void *stack;
         int pid, n, ret = 1;
 
         printf("Checking for the skas3 patch in the host...");
-        pid = start_ptraced_child(&stack);
+        pid = start_ptraced_child();
 
         n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
         if (n < 0) {
@@ -391,7 +380,7 @@ static inline int check_skas3_ptrace_support(void)
         }
 
         init_registers(pid);
-        stop_ptraced_child(pid, stack, 1, 1);
+        stop_ptraced_child(pid, 1, 1);
 
         return(ret);
 }
diff --git a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c
index ab5d3271da0b..fc71ef295782 100644
--- a/arch/um/kernel/skas/process_kern.c
+++ b/arch/um/kernel/skas/process_kern.c
@@ -68,8 +68,11 @@ void new_thread_handler(int sig)
          * 0 if it just exits
          */
         n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
-        if(n == 1)
+        if(n == 1){
+                /* Handle any immediate reschedules or signals */
+                interrupt_end();
                 userspace(&current->thread.regs.regs);
+        }
         else do_exit(0);
 }
 
@@ -96,6 +99,8 @@ void fork_handler(int sig)
         schedule_tail(current->thread.prev_sched);
         current->thread.prev_sched = NULL;
 
+        /* Handle any immediate reschedules or signals */
+        interrupt_end();
         userspace(&current->thread.regs.regs);
 }
 
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 418427107b29..8736d098f0ee 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -26,7 +26,6 @@
 #include "asm/setup.h"
 #include "ubd_user.h"
 #include "asm/current.h"
-#include "asm/setup.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "kern.h"
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 9aee0b62ebca..f0d6060e3e57 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -45,7 +45,11 @@ __init void scan_elf_aux( char **envp)
                                 elf_aux_hwcap = auxv->a_un.a_val;
                                 break;
                         case AT_PLATFORM:
-                                elf_aux_platform = auxv->a_un.a_ptr;
+                                /* elf.h removed the pointer elements from
+                                 * a_un, so we have to use a_val, which is
+                                 * all that's left.
+                                 */
+                                elf_aux_platform = (char *) auxv->a_un.a_val;
                                 break;
                         case AT_PAGESZ:
                                 page_size = auxv->a_un.a_val;
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 77d4066d1af8..fd45bb260907 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -363,7 +363,7 @@ int os_write_file(int fd, const void *buf, int len)
                        (int (*)(int, void *, int)) write, copy_to_user_proc));
 }
 
-int os_file_size(char *file, long long *size_out)
+int os_file_size(char *file, unsigned long long *size_out)
 {
         struct uml_stat buf;
         int err;
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index 0b2491883d9c..98346c711493 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -14,7 +14,7 @@ quiet_cmd_make_link = SYMLINK $@
 cmd_make_link       = ln -sf $(srctree)/arch/$(SUBARCH)/$($(notdir $@)-dir)/$(notdir $@) $@
 
 # this needs to be before the foreach, because targets does not accept
-# complete paths like $(obj)/$(f). To make sure this works, use a := assignment,
+# complete paths like $(obj)/$(f). To make sure this works, use a := assignment
 # or we will get $(obj)/$(f) in the "targets" value.
 # Also, this forces you to use the := syntax when assigning to targets.
 # Otherwise the line below will cause an infinite loop (if you don't know why,