17 files changed, 84 insertions, 593 deletions

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 79610b5ce6..773a134e7f 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -598,6 +598,11 @@ out:
         mconsole_reply(req, err_msg, err, 0);
 }
 
+struct mconsole_output {
+        struct list_head list;
+        struct mc_request *req;
+};
+
 static DEFINE_SPINLOCK(console_lock);
 static LIST_HEAD(clients);
 static char console_buf[MCONSOLE_MAX_DATA];
@@ -622,10 +627,10 @@ static void console_write(struct console *console, const char *string,
                         return;
 
                 list_for_each(ele, &clients){
-                        struct mconsole_entry *entry;
+                        struct mconsole_output *entry;
 
-                        entry = list_entry(ele, struct mconsole_entry, list);
-                        mconsole_reply_len(&entry->request, console_buf,
+                        entry = list_entry(ele, struct mconsole_output, list);
+                        mconsole_reply_len(entry->req, console_buf,
                                            console_index, 0, 1);
                 }
 
@@ -649,10 +654,10 @@ late_initcall(mc_add_console);
 static void with_console(struct mc_request *req, void (*proc)(void *),
                          void *arg)
 {
-        struct mconsole_entry entry;
+        struct mconsole_output entry;
         unsigned long flags;
 
-        entry.request = *req;
+        entry.req = req;
         list_add(&entry.list, &clients);
         spin_lock_irqsave(&console_lock, flags);
 
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 5b2f5fe9e4..17068eb746 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -131,6 +131,10 @@ int mconsole_get_request(int fd, struct mc_request *req)
 int mconsole_reply_len(struct mc_request *req, const char *str, int total,
                        int err, int more)
 {
+        /* XXX This is a stack consumption problem.  It'd be nice to
+         * make it global and serialize access to it, but there are a
+         * ton of callers to this function.
+         */
         struct mconsole_reply reply;
         int len, n;
 
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 664c2e2fb8..300a54a652 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -119,11 +119,6 @@ static int uml_net_open(struct net_device *dev)
                 goto out;
         }
 
-        if(!lp->have_mac){
-                dev_ip_addr(dev, &lp->mac[2]);
-                set_ether_mac(dev, lp->mac);
-        }
-
         lp->fd = (*lp->open)(&lp->user);
         if(lp->fd < 0){
                 err = lp->fd;
@@ -287,6 +282,37 @@ void uml_net_user_timer_expire(unsigned long _conn)
 #endif
 }
 
+static void setup_etheraddr(char *str, unsigned char *addr)
+{
+        char *end;
+        int i;
+
+        if(str == NULL)
+                goto random;
+
+        for(i=0;i<6;i++){
+                addr[i] = simple_strtoul(str, &end, 16);
+                if((end == str) ||
+                   ((*end != ':') && (*end != ',') && (*end != '\0'))){
+                        printk(KERN_ERR
+                               "setup_etheraddr: failed to parse '%s' "
+                               "as an ethernet address\n", str);
+                        goto random;
+                }
+                str = end + 1;
+        }
+        if(addr[0] & 1){
+                printk(KERN_ERR
+                       "Attempt to assign a broadcast ethernet address to a "
+                       "device disallowed\n");
+                goto random;
+        }
+        return;
+
+random:
+        random_ether_addr(addr);
+}
+
 static DEFINE_SPINLOCK(devices_lock);
 static LIST_HEAD(devices);
 
@@ -322,15 +348,13 @@ static int eth_configure(int n, void *init, char *mac,
         list_add(&device->list, &devices);
         spin_unlock(&devices_lock);
 
-        if (setup_etheraddr(mac, device->mac))
-                device->have_mac = 1;
+        setup_etheraddr(mac, device->mac);
 
         printk(KERN_INFO "Netdevice %d ", n);
-        if (device->have_mac)
-                printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
-                       device->mac[0], device->mac[1],
-                       device->mac[2], device->mac[3],
-                       device->mac[4], device->mac[5]);
+        printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
+               device->mac[0], device->mac[1],
+               device->mac[2], device->mac[3],
+               device->mac[4], device->mac[5]);
         printk(": ");
         dev = alloc_etherdev(size);
         if (dev == NULL) {
@@ -396,7 +420,6 @@ static int eth_configure(int n, void *init, char *mac,
                   .dev                  = dev,
                   .fd                   = -1,
                   .mac                  = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
-                  .have_mac             = device->have_mac,
                   .protocol             = transport->kern->protocol,
                   .open                 = transport->user->open,
                   .close                = transport->user->close,
@@ -411,14 +434,12 @@ static int eth_configure(int n, void *init, char *mac,
         init_timer(&lp->tl);
         spin_lock_init(&lp->lock);
         lp->tl.function = uml_net_user_timer_expire;
-        if (lp->have_mac)
-                memcpy(lp->mac, device->mac, sizeof(lp->mac));
+        memcpy(lp->mac, device->mac, sizeof(lp->mac));
 
         if (transport->user->init) 
                 (*transport->user->init)(&lp->user, dev);
 
-        if (device->have_mac)
-                set_ether_mac(dev, device->mac);
+        set_ether_mac(dev, device->mac);
 
         return 0;
 }
@@ -747,47 +768,6 @@ static void close_devices(void)
 
 __uml_exitcall(close_devices);
 
-int setup_etheraddr(char *str, unsigned char *addr)
-{
-        char *end;
-        int i;
-
-        if(str == NULL)
-                return(0);
-        for(i=0;i<6;i++){
-                addr[i] = simple_strtoul(str, &end, 16);
-                if((end == str) ||
-                   ((*end != ':') && (*end != ',') && (*end != '\0'))){
-                        printk(KERN_ERR 
-                               "setup_etheraddr: failed to parse '%s' "
-                               "as an ethernet address\n", str);
-                        return(0);
-                }
-                str = end + 1;
-        }
-        if(addr[0] & 1){
-                printk(KERN_ERR 
-                       "Attempt to assign a broadcast ethernet address to a "
-                       "device disallowed\n");
-                return(0);
-        }
-        return(1);
-}
-
-void dev_ip_addr(void *d, unsigned char *bin_buf)
-{
-        struct net_device *dev = d;
-        struct in_device *ip = dev->ip_ptr;
-        struct in_ifaddr *in;
-
-        if((ip == NULL) || ((in = ip->ifa_list) == NULL)){
-                printk(KERN_WARNING "dev_ip_addr - device not assigned an "
-                       "IP address\n");
-                return;
-        }
-        memcpy(bin_buf, &in->ifa_address, sizeof(in->ifa_address));
-}
-
 struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra)
 {
         if((skb != NULL) && (skb_tailroom(skb) < extra)){
@@ -825,7 +805,7 @@ int dev_netmask(void *d, void *m)
         struct net_device *dev = d;
         struct in_device *ip = dev->ip_ptr;
         struct in_ifaddr *in;
-        __u32 *mask_out = m;
+        __be32 *mask_out = m;
 
         if(ip == NULL) 
                 return(1);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 107c5e43fa..f3a3f8a29c 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/time.h>
 #include "user.h"
 #include "user_util.h"
 #include "kern_util.h"
diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 3683ed4431..9016c68bee 100644
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -8,6 +8,7 @@
 #include "chan_user.h"
 #include "os.h"
 
+/* This address is used only as a unique identifer */
 static int null_chan;
 
 static void *null_init(char *str, int device, const struct chan_opts *opts)
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index ae9909415b..73b2bdd6d2 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -20,6 +20,10 @@
 
 #define RNG_MISCDEV_MINOR               183 /* official */
 
+/* Changed at init time, in the non-modular case, and at module load
+ * time, in the module case.  Presumably, the module subsystem
+ * protects against a module being loaded twice at the same time.
+ */
 static int random_fd = -1;
 
 static int rng_dev_open (struct inode *inode, struct file *filp)
diff --git a/arch/um/drivers/stderr_console.c b/arch/um/drivers/stderr_console.c
index 6d2cf32a9e..9115392938 100644
--- a/arch/um/drivers/stderr_console.c
+++ b/arch/um/drivers/stderr_console.c
@@ -9,6 +9,8 @@
 /*
  * Don't register by default -- as this registeres very early in the
  * boot process it becomes the default console.
+ *
+ * Initialized at init time.
  */
 static int use_stderr_console = 0;
 
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 5e44adb070..e4bfcfe855 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -108,6 +108,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
         return line_open(vts, tty);
 }
 
+/* Set in an initcall, checked in an exitcall */
 static int con_init_done = 0;
 
 static const struct tty_operations console_ops = {
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 34085315aa..fda4a39406 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -668,18 +668,15 @@ static int ubd_add(int n)
         if(dev->file == NULL)
                 goto out;
 
-        if (ubd_open_dev(dev))
-                goto out;
-
         err = ubd_file_size(dev, &dev->size);
         if(err < 0)
-                goto out_close;
+                goto out;
 
         dev->size = ROUND_BLOCK(dev->size);
 
         err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
         if(err)
-                goto out_close;
+                goto out;
 
         if(fake_major != MAJOR_NR)
                 ubd_new_disk(fake_major, dev->size, n,
@@ -691,8 +688,6 @@ static int ubd_add(int n)
                 make_ide_entries(ubd_gendisk[n]->disk_name);
 
         err = 0;
-out_close:
-        ubd_close(dev);
 out:
         return err;
 }
@@ -986,8 +981,6 @@ static int prepare_request(struct request *req, struct io_thread_req *io_req)
         __u64 offset;
         int len;
 
-        if(req->rq_status == RQ_INACTIVE) return(1);
-
         /* This should be impossible now */
         if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
                 printk("Write attempted on readonly ubd device %s\n",
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h
index 769fba43ee..280459fb0b 100644
--- a/arch/um/include/net_kern.h
+++ b/arch/um/include/net_kern.h
@@ -18,7 +18,6 @@ struct uml_net {
         struct platform_device pdev;
         int index;
         unsigned char mac[ETH_ALEN];
-        int have_mac;
 };
 
 struct uml_net_private {
@@ -29,7 +28,6 @@ struct uml_net_private {
         struct net_device_stats stats;
         int fd;
         unsigned char mac[ETH_ALEN];
-        int have_mac;
         unsigned short (*protocol)(struct sk_buff *);
         int (*open)(void *);
         void (*close)(int, void *);
@@ -62,7 +60,6 @@ struct transport {
 
 extern struct net_device *ether_init(int);
 extern unsigned short ether_protocol(struct sk_buff *);
-extern int setup_etheraddr(char *str, unsigned char *addr);
 extern struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra);
 extern int tap_setup_common(char *str, char *type, char **dev_name, 
                             char **mac_out, char **gate_addr);
@@ -70,14 +67,3 @@ extern void register_transport(struct transport *new);
 extern unsigned short eth_protocol(struct sk_buff *skb);
 
 #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/include/net_user.h b/arch/um/include/net_user.h
index 47ef7cb49a..19f207cd70 100644
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -25,9 +25,8 @@ struct net_user_info {
 };
 
 extern void ether_user_init(void *data, void *dev);
-extern void dev_ip_addr(void *d, unsigned char *bin_buf);
-extern void iter_addresses(void *d, void (*cb)(unsigned char *, 
-                                               unsigned char *, void *), 
+extern void iter_addresses(void *d, void (*cb)(unsigned char *,
+                                               unsigned char *, void *),
                            void *arg);
 
 extern void *get_output_buffer(int *len_out);
@@ -52,14 +51,3 @@ extern char *split_if_spec(char *str, ...);
 extern int dev_netmask(void *d, void *m);
 
 #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/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index d21ebad666..8b7f2cdedf 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -16,9 +16,13 @@ int uml_exitcode = 0;
 static int read_proc_exitcode(char *page, char **start, off_t off,
                               int count, int *eof, void *data)
 {
-        int len;
+        int len, val;
 
-        len = sprintf(page, "%d\n", uml_exitcode);
+        /* Save uml_exitcode in a local so that we don't need to guarantee
+         * that sprintf accesses it atomically.
+         */
+        val = uml_exitcode;
+        len = sprintf(page, "%d\n", val);
         len -= off;
         if(len <= off+count) *eof = 1;
         *start = page + off;
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 79c22707a6..4cd2ff546e 100644
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -61,8 +61,10 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
 #endif
 
         *pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT));
-        *pte = pte_mkexec(*pte);
-        *pte = pte_wrprotect(*pte);
+        /* This is wrong for the code page, but it doesn't matter since the
+         * stub is mapped by hand with the correct permissions.
+         */
+        *pte = pte_mkwrite(*pte);
         return(0);
 
  out_pmd:
diff --git a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c
deleted file mode 100644
index 0f3d5d084d..0000000000
--- a/arch/um/kernel/skas/process_kern.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Copyright 2003 PathScale, Inc.
- * Licensed under the GPL
- */
-
-#include "linux/config.h"
-#include "linux/kernel.h"
-#include "linux/sched.h"
-#include "linux/interrupt.h"
-#include "linux/string.h"
-#include "linux/mm.h"
-#include "linux/slab.h"
-#include "linux/utsname.h"
-#include "linux/fs.h"
-#include "linux/utime.h"
-#include "linux/smp_lock.h"
-#include "linux/module.h"
-#include "linux/init.h"
-#include "linux/capability.h"
-#include "linux/vmalloc.h"
-#include "linux/spinlock.h"
-#include "linux/proc_fs.h"
-#include "linux/ptrace.h"
-#include "linux/random.h"
-#include "linux/personality.h"
-#include "asm/unistd.h"
-#include "asm/mman.h"
-#include "asm/segment.h"
-#include "asm/stat.h"
-#include "asm/pgtable.h"
-#include "asm/processor.h"
-#include "asm/tlbflush.h"
-#include "asm/uaccess.h"
-#include "asm/user.h"
-#include "user_util.h"
-#include "kern_util.h"
-#include "kern.h"
-#include "signal_kern.h"
-#include "init.h"
-#include "irq_user.h"
-#include "mem_user.h"
-#include "tlb.h"
-#include "frame_kern.h"
-#include "sigcontext.h"
-#include "os.h"
-#include "mode.h"
-#include "mode_kern.h"
-#include "choose-mode.h"
-
-/* This is a per-cpu array.  A processor only modifies its entry and it only
- * cares about its entry, so it's OK if another processor is modifying its
- * entry.
- */
-struct cpu_task cpu_tasks[NR_CPUS] = { [0 ... NR_CPUS - 1] = { -1, NULL } };
-
-int external_pid(void *t)
-{
-        struct task_struct *task = t ? t : current;
-
-        return(CHOOSE_MODE_PROC(external_pid_tt, external_pid_skas, task));
-}
-
-int pid_to_processor_id(int pid)
-{
-        int i;
-
-        for(i = 0; i < ncpus; i++){
-                if(cpu_tasks[i].pid == pid) return(i);
-        }
-        return(-1);
-}
-
-void free_stack(unsigned long stack, int order)
-{
-        free_pages(stack, order);
-}
-
-unsigned long alloc_stack(int order, int atomic)
-{
-        unsigned long page;
-        gfp_t flags = GFP_KERNEL;
-
-        if (atomic)
-                flags = GFP_ATOMIC;
-        page = __get_free_pages(flags, order);
-        if(page == 0)
-                return(0);
-        stack_protections(page);
-        return(page);
-}
-
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-        int pid;
-
-        current->thread.request.u.thread.proc = fn;
-        current->thread.request.u.thread.arg = arg;
-        pid = do_fork(CLONE_VM | CLONE_UNTRACED | flags, 0,
-                      &current->thread.regs, 0, NULL, NULL);
-        if(pid < 0)
-                panic("do_fork failed in kernel_thread, errno = %d", pid);
-        return(pid);
-}
-
-void set_current(void *t)
-{
-        struct task_struct *task = t;
-
-        cpu_tasks[task_thread_info(task)->cpu] = ((struct cpu_task)
-                { external_pid(task), task });
-}
-
-void *_switch_to(void *prev, void *next, void *last)
-{
-        struct task_struct *from = prev;
-        struct task_struct *to= next;
-
-        to->thread.prev_sched = from;
-        set_current(to);
-
-        do {
-                current->thread.saved_task = NULL ;
-                CHOOSE_MODE_PROC(switch_to_tt, switch_to_skas, prev, next);
-                if(current->thread.saved_task)
-                        show_regs(&(current->thread.regs));
-                next= current->thread.saved_task;
-                prev= current;
-        } while(current->thread.saved_task);
-
-        return(current->thread.prev_sched);
-
-}
-
-void interrupt_end(void)
-{
-        if(need_resched()) schedule();
-        if(test_tsk_thread_flag(current, TIF_SIGPENDING)) do_signal();
-}
-
-void release_thread(struct task_struct *task)
-{
-        CHOOSE_MODE(release_thread_tt(task), release_thread_skas(task));
-}
-
-void exit_thread(void)
-{
-        unprotect_stack((unsigned long) current_thread);
-}
-
-void *get_current(void)
-{
-        return(current);
-}
-
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
-                unsigned long stack_top, struct task_struct * p,
-                struct pt_regs *regs)
-{
-        int ret;
-
-        p->thread = (struct thread_struct) INIT_THREAD;
-        ret = CHOOSE_MODE_PROC(copy_thread_tt, copy_thread_skas, nr,
-                                clone_flags, sp, stack_top, p, regs);
-
-        if (ret || !current->thread.forking)
-                goto out;
-
-        clear_flushed_tls(p);
-
-        /*
-         * Set a new TLS for the child thread?
-         */
-        if (clone_flags & CLONE_SETTLS)
-                ret = arch_copy_tls(p);
-
-out:
-        return ret;
-}
-
-void initial_thread_cb(void (*proc)(void *), void *arg)
-{
-        int save_kmalloc_ok = kmalloc_ok;
-
-        kmalloc_ok = 0;
-        CHOOSE_MODE_PROC(initial_thread_cb_tt, initial_thread_cb_skas, proc,
-                         arg);
-        kmalloc_ok = save_kmalloc_ok;
-}
-
-unsigned long stack_sp(unsigned long page)
-{
-        return(page + PAGE_SIZE - sizeof(void *));
-}
-
-int current_pid(void)
-{
-        return(current->pid);
-}
-
-void default_idle(void)
-{
-        CHOOSE_MODE(uml_idle_timer(), (void) 0);
-
-        while(1){
-                /* endless idle loop with no priority at all */
-
-                /*
-                 * although we are an idle CPU, we do not want to
-                 * get into the scheduler unnecessarily.
-                 */
-                if(need_resched())
-                        schedule();
-
-                idle_sleep(10);
-        }
-}
-
-void cpu_idle(void)
-{
-        CHOOSE_MODE(init_idle_tt(), init_idle_skas());
-}
-
-int page_size(void)
-{
-        return(PAGE_SIZE);
-}
-
-void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
-                      pte_t *pte_out)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        pte_t ptent;
-
-        if(task->mm == NULL)
-                return(ERR_PTR(-EINVAL));
-        pgd = pgd_offset(task->mm, addr);
-        if(!pgd_present(*pgd))
-                return(ERR_PTR(-EINVAL));
-
-        pud = pud_offset(pgd, addr);
-        if(!pud_present(*pud))
-                return(ERR_PTR(-EINVAL));
-
-        pmd = pmd_offset(pud, addr);
-        if(!pmd_present(*pmd))
-                return(ERR_PTR(-EINVAL));
-
-        pte = pte_offset_kernel(pmd, addr);
-        ptent = *pte;
-        if(!pte_present(ptent))
-                return(ERR_PTR(-EINVAL));
-
-        if(pte_out != NULL)
-                *pte_out = ptent;
-        return((void *) (pte_val(ptent) & PAGE_MASK) + (addr & ~PAGE_MASK));
-}
-
-char *current_cmd(void)
-{
-#if defined(CONFIG_SMP) || defined(CONFIG_HIGHMEM)
-        return("(Unknown)");
-#else
-        void *addr = um_virt_to_phys(current, current->mm->arg_start, NULL);
-        return IS_ERR(addr) ? "(Unknown)": __va((unsigned long) addr);
-#endif
-}
-
-void force_sigbus(void)
-{
-        printk(KERN_ERR "Killing pid %d because of a lack of memory\n",
-               current->pid);
-        lock_kernel();
-        sigaddset(&current->pending.signal, SIGBUS);
-        recalc_sigpending();
-        current->flags |= PF_SIGNALED;
-        do_exit(SIGBUS | 0x80);
-}
-
-void dump_thread(struct pt_regs *regs, struct user *u)
-{
-}
-
-void enable_hlt(void)
-{
-        panic("enable_hlt");
-}
-
-EXPORT_SYMBOL(enable_hlt);
-
-void disable_hlt(void)
-{
-        panic("disable_hlt");
-}
-
-EXPORT_SYMBOL(disable_hlt);
-
-void *um_kmalloc(int size)
-{
-        return kmalloc(size, GFP_KERNEL);
-}
-
-void *um_kmalloc_atomic(int size)
-{
-        return kmalloc(size, GFP_ATOMIC);
-}
-
-void *um_vmalloc(int size)
-{
-        return vmalloc(size);
-}
-
-void *um_vmalloc_atomic(int size)
-{
-        return __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM, PAGE_KERNEL);
-}
-
-int __cant_sleep(void) {
-        return in_atomic() || irqs_disabled() || in_interrupt();
-        /* Is in_interrupt() really needed? */
-}
-
-unsigned long get_fault_addr(void)
-{
-        return((unsigned long) current->thread.fault_addr);
-}
-
-EXPORT_SYMBOL(get_fault_addr);
-
-void not_implemented(void)
-{
-        printk(KERN_DEBUG "Something isn't implemented in here\n");
-}
-
-EXPORT_SYMBOL(not_implemented);
-
-int user_context(unsigned long sp)
-{
-        unsigned long stack;
-
-        stack = sp & (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER);
-        return(stack != (unsigned long) current_thread);
-}
-
-extern exitcall_t __uml_exitcall_begin, __uml_exitcall_end;
-
-void do_uml_exitcalls(void)
-{
-        exitcall_t *call;
-
-        call = &__uml_exitcall_end;
-        while (--call >= &__uml_exitcall_begin)
-                (*call)();
-}
-
-char *uml_strdup(char *string)
-{
-        return kstrdup(string, GFP_KERNEL);
-}
-
-int copy_to_user_proc(void __user *to, void *from, int size)
-{
-        return(copy_to_user(to, from, size));
-}
-
-int copy_from_user_proc(void *to, void __user *from, int size)
-{
-        return(copy_from_user(to, from, size));
-}
-
-int clear_user_proc(void __user *buf, int size)
-{
-        return(clear_user(buf, size));
-}
-
-int strlen_user_proc(char __user *str)
-{
-        return(strlen_user(str));
-}
-
-int smp_sigio_handler(void)
-{
-#ifdef CONFIG_SMP
-        int cpu = current_thread->cpu;
-        IPI_handler(cpu);
-        if(cpu != 0)
-                return(1);
-#endif
-        return(0);
-}
-
-int cpu(void)
-{
-        return(current_thread->cpu);
-}
-
-static atomic_t using_sysemu = ATOMIC_INIT(0);
-int sysemu_supported;
-
-void set_using_sysemu(int value)
-{
-        if (value > sysemu_supported)
-                return;
-        atomic_set(&using_sysemu, value);
-}
-
-int get_using_sysemu(void)
-{
-        return atomic_read(&using_sysemu);
-}
-
-static int proc_read_sysemu(char *buf, char **start, off_t offset, int size,int *eof, void *data)
-{
-        if (snprintf(buf, size, "%d\n", get_using_sysemu()) < size) /*No overflow*/
-                *eof = 1;
-
-        return strlen(buf);
-}
-
-static int proc_write_sysemu(struct file *file,const char __user *buf, unsigned long count,void *data)
-{
-        char tmp[2];
-
-        if (copy_from_user(tmp, buf, 1))
-                return -EFAULT;
-
-        if (tmp[0] >= '0' && tmp[0] <= '2')
-                set_using_sysemu(tmp[0] - '0');
-        return count; /*We use the first char, but pretend to write everything*/
-}
-
-int __init make_proc_sysemu(void)
-{
-        struct proc_dir_entry *ent;
-        if (!sysemu_supported)
-                return 0;
-
-        ent = create_proc_entry("sysemu", 0600, &proc_root);
-
-        if (ent == NULL)
-        {
-                printk(KERN_WARNING "Failed to register /proc/sysemu\n");
-                return(0);
-        }
-
-        ent->read_proc  = proc_read_sysemu;
-        ent->write_proc = proc_write_sysemu;
-
-        return 0;
-}
-
-late_initcall(make_proc_sysemu);
-
-int singlestepping(void * t)
-{
-        struct task_struct *task = t ? t : current;
-
-        if ( ! (task->ptrace & PT_DTRACE) )
-                return(0);
-
-        if (task->thread.singlestep_syscall)
-                return(1);
-
-        return 2;
-}
-
-/*
- * Only x86 and x86_64 have an arch_align_stack().
- * All other arches have "#define arch_align_stack(x) (x)"
- * in their asm/system.h
- * As this is included in UML from asm-um/system-generic.h,
- * we can use it to behave as the subarch does.
- */
-#ifndef arch_align_stack
-unsigned long arch_align_stack(unsigned long sp)
-{
-        if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-                sp -= get_random_int() % 8192;
-        return sp & ~0xf;
-}
-#endif
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 820affbf3e..a92965f8f9 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -93,7 +93,7 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
 
         write_seqlock_irqsave(&xtime_lock, flags);
 
-        do_timer(regs);
+        do_timer(1);
 
         nsecs = get_time();
         xtime.tv_sec = nsecs / NSEC_PER_SEC;
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 61a23fff43..c7b195c7e5 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -120,7 +120,7 @@ out_nosemaphore:
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-        if (current->pid == 1) {
+        if (is_init(current)) {
                 up_read(&mm->mmap_sem);
                 yield();
                 down_read(&mm->mmap_sem);
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index b170b4704d..4203681e50 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -132,6 +132,9 @@ err:
         else if(found < 0)
                 printf("read returned errno %d\n", -found);
 
+out:
+        close(fd);
+
         return;
 
 found:
@@ -141,11 +144,12 @@ found:
 
         if(strncmp(buf, "tmpfs", strlen("tmpfs"))){
                 printf("not tmpfs\n");
-                return;
+                goto out;
         }
 
         printf("OK\n");
         default_tmpdir = "/dev/shm";
+        goto out;
 }
 
 /*