17 files changed, 132 insertions, 178 deletions
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index 6fa63a2a89e3..c5cf4a0827b0 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
 clean-files :=
 obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \
-        physmem.o process.o ptrace.o reboot.o resource.o sigio.o \
+        physmem.o process.o ptrace.o reboot.o sigio.o \
        signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \
        um_arch.o umid.o
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 8d56ec6cca79..121166400e25 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -39,9 +39,9 @@ static long execve1(char *file, char __user * __user *argv,
                    char __user *__user *env)
 {
        long error;
+#ifdef CONFIG_TTY_LOG
        struct tty_struct *tty;
-#ifdef CONFIG_TTY_LOG
        mutex_lock(&tty_mutex);
        tty = get_current_tty();
        if (tty)
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 5c1e611f628d..50a288bb875a 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -79,7 +79,7 @@ skip:
        return 0;
 }
-struct irq_fd *active_fds = NULL;
+static struct irq_fd *active_fds = NULL;
 static struct irq_fd **last_irq_ptr = &active_fds;
 extern void free_irqs(void);
@@ -124,8 +124,8 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
        if (err < 0)
                goto out;
-        new_fd = um_kmalloc(sizeof(*new_fd));
        err = -ENOMEM;
+        new_fd = kmalloc(sizeof(struct irq_fd), GFP_KERNEL);
        if (new_fd == NULL)
                goto out;
@@ -176,9 +176,8 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
                 */
                spin_unlock_irqrestore(&irq_lock, flags);
                kfree(tmp_pfd);
-                tmp_pfd = NULL;
-                tmp_pfd = um_kmalloc(n);
+                tmp_pfd = kmalloc(n, GFP_KERNEL);
                if (tmp_pfd == NULL)
                        goto out_kfree;
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index c95855ba6ab5..e85d65deea0d 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -24,8 +24,9 @@
 #include "init.h"
 #include "kern_constants.h"
-/* Changed during early boot */
+/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */
 unsigned long *empty_zero_page = NULL;
+/* allocated in paging_init and unchanged thereafter */
 unsigned long *empty_bad_page = NULL;
 pgd_t swapper_pg_dir[PTRS_PER_PGD];
 unsigned long long highmem;
@@ -65,8 +66,8 @@ void mem_init(void)
 {
        max_low_pfn = (high_physmem - uml_physmem) >> PAGE_SHIFT;
-        /* clear the zero-page */
+        /* clear the zero-page */
-        memset((void *) empty_zero_page, 0, PAGE_SIZE);
+        memset((void *) empty_zero_page, 0, PAGE_SIZE);
        /* Map in the area just after the brk now that kmalloc is about
         * to be turned on.
@@ -253,8 +254,10 @@ struct page *arch_validate(struct page *page, gfp_t mask, int order)
        int i;
 again:
-        if(page == NULL) return(page);
+        if(page == NULL)
-        if(PageHighMem(page)) return(page);
+                return page;
+        if(PageHighMem(page))
+                return page;
        addr = (unsigned long) page_address(page);
        for(i = 0; i < (1 << order); i++){
@@ -263,13 +266,15 @@ struct page *arch_validate(struct page *page, gfp_t mask, int order)
                                     sizeof(zero),
                                     &current->thread.fault_addr,
                                     &current->thread.fault_catcher)){
-                        if(!(mask & __GFP_WAIT)) return(NULL);
+                        if(!(mask & __GFP_WAIT))
+                                return NULL;
                        else break;
                }
                addr += PAGE_SIZE;
        }
-        if(i == (1 << order)) return(page);
+        if(i == (1 << order))
+                return page;
        page = alloc_pages(mask, order);
        goto again;
 }
@@ -283,7 +288,6 @@ void free_initmem(void)
 }
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (start < end)
@@ -296,37 +300,36 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                totalram_pages++;
        }
 }
-        
 #endif
 void show_mem(void)
 {
-        int pfn, total = 0, reserved = 0;
+        int pfn, total = 0, reserved = 0;
-        int shared = 0, cached = 0;
+        int shared = 0, cached = 0;
-        int highmem = 0;
+        int highmem = 0;
        struct page *page;
-        printk("Mem-info:\n");
+        printk("Mem-info:\n");
-        show_free_areas();
+        show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
+        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-        pfn = max_mapnr;
+        pfn = max_mapnr;
-        while(pfn-- > 0) {
+        while(pfn-- > 0) {
                page = pfn_to_page(pfn);
-                total++;
+                total++;
-                if(PageHighMem(page))
+                if(PageHighMem(page))
-                        highmem++;
+                        highmem++;
-                if(PageReserved(page))
+                if(PageReserved(page))
-                        reserved++;
+                        reserved++;
-                else if(PageSwapCache(page))
+                else if(PageSwapCache(page))
-                        cached++;
+                        cached++;
-                else if(page_count(page))
+                else if(page_count(page))
-                        shared += page_count(page) - 1;
+                        shared += page_count(page) - 1;
-        }
+        }
-        printk("%d pages of RAM\n", total);
+        printk("%d pages of RAM\n", total);
-        printk("%d pages of HIGHMEM\n", highmem);
+        printk("%d pages of HIGHMEM\n", highmem);
-        printk("%d reserved pages\n", reserved);
+        printk("%d reserved pages\n", reserved);
-        printk("%d pages shared\n", shared);
+        printk("%d pages shared\n", shared);
-        printk("%d pages swap cached\n", cached);
+        printk("%d pages swap cached\n", cached);
 }
 /*
@@ -362,28 +365,7 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
        struct page *pte;
-   
        pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
        return pte;
 }
-struct iomem_region *iomem_regions = NULL;
-int iomem_size = 0;
-extern int parse_iomem(char *str, int *add) __init;
-__uml_setup("iomem=", parse_iomem,
-"iomem=<name>,<file>\n"
-"    Configure <file> as an IO memory region named <name>.\n\n"
-);
-/*
- * 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/physmem.c b/arch/um/kernel/physmem.c
index abafa64b8727..638f3b5f6094 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -40,7 +40,7 @@ static struct rb_node **find_rb(void *virt)
        while(*n != NULL){
                d = rb_entry(*n, struct phys_desc, rb);
                if(d->virt == virt)
-                        return(n);
+                        return n;
                if(d->virt > virt)
                        n = &(*n)->rb_left;
@@ -48,7 +48,7 @@ static struct rb_node **find_rb(void *virt)
                        n = &(*n)->rb_right;
        }
-        return(n);
+        return n;
 }
 static struct phys_desc *find_phys_mapping(void *virt)
@@ -56,9 +56,9 @@ static struct phys_desc *find_phys_mapping(void *virt)
        struct rb_node **n = find_rb(virt);
        if(*n == NULL)
-                return(NULL);
+                return NULL;
-        return(rb_entry(*n, struct phys_desc, rb));
+        return rb_entry(*n, struct phys_desc, rb);
 }
 static void insert_phys_mapping(struct phys_desc *desc)
@@ -89,10 +89,10 @@ static struct desc_mapping *find_mapping(int fd)
        list_for_each(ele, &descriptor_mappings){
                desc = list_entry(ele, struct desc_mapping, list);
                if(desc->fd == fd)
-                        return(desc);
+                        return desc;
        }
-        return(NULL);
+        return NULL;
 }
 static struct desc_mapping *descriptor_mapping(int fd)
@@ -101,11 +101,11 @@ static struct desc_mapping *descriptor_mapping(int fd)
        desc = find_mapping(fd);
        if(desc != NULL)
-                return(desc);
+                return desc;
        desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
        if(desc == NULL)
-                return(NULL);
+                return NULL;
        *desc = ((struct desc_mapping)
                { .fd =         fd,
@@ -113,7 +113,7 @@ static struct desc_mapping *descriptor_mapping(int fd)
                  .pages =      LIST_HEAD_INIT(desc->pages) });
        list_add(&desc->list, &descriptor_mappings);
-        return(desc);
+        return desc;
 }
 int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
@@ -125,11 +125,11 @@ int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
        fd_maps = descriptor_mapping(fd);
        if(fd_maps == NULL)
-                return(-ENOMEM);
+                return -ENOMEM;
        phys = __pa(virt);
        desc = find_phys_mapping(virt);
-        if(desc != NULL)
+        if(desc != NULL)
                panic("Address 0x%p is already substituted\n", virt);
        err = -ENOMEM;
@@ -155,7 +155,7 @@ int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
        rb_erase(&desc->rb, &phys_mappings);
        kfree(desc);
 out:
-        return(err);
+        return err;
 }
 static int physmem_fd = -1;
@@ -182,10 +182,10 @@ int physmem_remove_mapping(void *virt)
        virt = (void *) ((unsigned long) virt & PAGE_MASK);
        desc = find_phys_mapping(virt);
        if(desc == NULL)
-                return(0);
+                return 0;
        remove_mapping(desc);
-        return(1);
+        return 1;
 }
 void physmem_forget_descriptor(int fd)
@@ -239,9 +239,9 @@ void arch_free_page(struct page *page, int order)
 int is_remapped(void *virt)
 {
-        struct phys_desc *desc = find_phys_mapping(virt);
+        struct phys_desc *desc = find_phys_mapping(virt);
-        return(desc != NULL);
+        return desc != NULL;
 }
 /* Changed during early boot */
@@ -276,7 +276,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
        else map = alloc_bootmem_low_pages(total_len);
        if(map == NULL)
-                return(-ENOMEM);
+                return -ENOMEM;
        for(i = 0; i < total_pages; i++){
                p = &map[i];
@@ -286,7 +286,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
        }
        max_mapnr = total_pages;
-        return(0);
+        return 0;
 }
 /* Changed during early boot */
@@ -296,7 +296,7 @@ unsigned long get_kmem_end(void)
 {
        if(kmem_top == 0)
                kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
-        return(kmem_top);
+        return kmem_top;
 }
 void map_memory(unsigned long virt, unsigned long phys, unsigned long len,
@@ -379,7 +379,7 @@ int phys_mapping(unsigned long phys, __u64 *offset_out)
                *offset_out = phys - iomem_size;
        }
-        return(fd);
+        return fd;
 }
 static int __init uml_mem_setup(char *line, int *add)
@@ -398,6 +398,23 @@ __uml_setup("mem=", uml_mem_setup,
 "       Example: mem=64M\n\n"
 );
+extern int __init parse_iomem(char *str, int *add);
+__uml_setup("iomem=", parse_iomem,
+"iomem=<name>,<file>\n"
+"    Configure <file> as an IO memory region named <name>.\n\n"
+);
+/*
+ * This list is constructed in parse_iomem and addresses filled in in
+ * setup_iomem, both of which run during early boot.  Afterwards, it's
+ * unchanged.
+ */
+struct iomem_region *iomem_regions = NULL;
+/* Initialized in parse_iomem */
+int iomem_size = 0;
 unsigned long find_iomem(char *driver, unsigned long *len_out)
 {
        struct iomem_region *region = iomem_regions;
@@ -405,13 +422,13 @@ unsigned long find_iomem(char *driver, unsigned long *len_out)
        while(region != NULL){
                if(!strcmp(region->driver, driver)){
                        *len_out = region->size;
-                        return(region->virt);
+                        return region->virt;
                }
                region = region->next;
        }
-        return(0);
+        return 0;
 }
 int setup_iomem(void)
@@ -435,18 +452,7 @@ int setup_iomem(void)
                region = region->next;
        }
-        return(0);
+        return 0;
 }
 __initcall(setup_iomem);
-/*
- * 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/ptrace.c b/arch/um/kernel/ptrace.c
index 9a77fb3c269d..627742d89434 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -18,6 +18,7 @@
 #include "kern_util.h"
 #include "skas_ptrace.h"
 #include "sysdep/ptrace.h"
+#include "os.h"
 static inline void set_singlestepping(struct task_struct *child, int on)
 {
@@ -241,6 +242,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                break;
        }
 #endif
+#ifdef PTRACE_ARCH_PRCTL
+        case PTRACE_ARCH_PRCTL:
+                /* XXX Calls ptrace on the host - needs some SMP thinking */
+                ret = arch_prctl_skas(child, data, (void *) addr);
+                break;
+#endif
        default:
                ret = ptrace_request(child, request, addr, data);
                break;
diff --git a/arch/um/kernel/resource.c b/arch/um/kernel/resource.c
deleted file mode 100644
index 32188e12e8af..000000000000
--- a/arch/um/kernel/resource.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 
- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-#include "linux/pci.h"
-unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
-                             unsigned long start, unsigned long size)
-{
-        return start;
-}
-/*
- * 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/sigio.c b/arch/um/kernel/sigio.c
index 2b0ab438301c..89f9866a1354 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -23,7 +23,7 @@ static irqreturn_t sigio_interrupt(int irq, void *data)
        os_read_file(sigio_irq_fd, &c, sizeof(c));
        reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
-        return(IRQ_HANDLED);
+        return IRQ_HANDLED;
 }
 int write_sigio_irq(int fd)
@@ -36,12 +36,13 @@ int write_sigio_irq(int fd)
        if(err){
                printk("write_sigio_irq : um_request_irq failed, err = %d\n",
                       err);
-                return(-1);
+                return -1;
        }
        sigio_irq_fd = fd;
-        return(0);
+        return 0;
 }
+/* These are called from os-Linux/sigio.c to protect its pollfds arrays. */
 static DEFINE_SPINLOCK(sigio_spinlock);
 void sigio_lock(void)
diff --git a/arch/um/kernel/skas/mem.c b/arch/um/kernel/skas/mem.c
index 0d2cce621134..7c18dfcd7d8e 100644
--- a/arch/um/kernel/skas/mem.c
+++ b/arch/um/kernel/skas/mem.c
@@ -14,13 +14,9 @@ unsigned long set_task_sizes_skas(unsigned long *task_size_out)
        unsigned long host_task_size = ROUND_4M((unsigned long)
                                                &host_task_size);
-#ifdef CONFIG_HOST_TASK_SIZE
-        *host_size_out = ROUND_4M(CONFIG_HOST_TASK_SIZE);
-        *task_size_out = CONFIG_HOST_TASK_SIZE;
-#else
        if (!skas_needs_stub)
                *task_size_out = host_task_size;
        else *task_size_out = CONFIG_STUB_START & PGDIR_MASK;
-#endif
        return host_task_size;
 }
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index f5ed8624648b..2828c5283227 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -149,22 +149,6 @@ long sys_olduname(struct oldold_utsname __user * name)
        return error;
 }
-DEFINE_SPINLOCK(syscall_lock);
-static int syscall_index = 0;
-int next_syscall_index(int limit)
-{
-        int ret;
-        spin_lock(&syscall_lock);
-        ret = syscall_index;
-        if(++syscall_index == limit)
-                syscall_index = 0;
-        spin_unlock(&syscall_lock);
-        return(ret);
-}
 int kernel_execve(const char *filename, char *const argv[], char *const envp[])
 {
        mm_segment_t fs;
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index 239c98054dec..f9e02b31a97a 100644
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -50,7 +50,7 @@ void dump_stack(void)
 EXPORT_SYMBOL(dump_stack);
 /*Stolen from arch/i386/kernel/traps.c */
-static int kstack_depth_to_print = 24;
+static const int kstack_depth_to_print = 24;
 /* This recently started being used in arch-independent code too, as in
 * kernel/sched.c.*/
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 2e354b3ca060..b1f8b0752419 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -35,31 +35,31 @@ unsigned long long sched_clock(void)
        return (unsigned long long)jiffies_64 * (1000000000 / HZ);
 }
-static unsigned long long prev_nsecs;
+static unsigned long long prev_nsecs[NR_CPUS];
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
-static long long delta;                 /* Deviation per interval */
+static long long delta[NR_CPUS];                /* Deviation per interval */
 #endif
 void timer_irq(union uml_pt_regs *regs)
 {
        unsigned long long ticks = 0;
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
-        if(prev_nsecs){
+        int c = cpu();
+        if(prev_nsecs[c]){
                /* We've had 1 tick */
                unsigned long long nsecs = os_nsecs();
-                delta += nsecs - prev_nsecs;
+                delta[c] += nsecs - prev_nsecs[c];
-                prev_nsecs = nsecs;
+                prev_nsecs[c] = nsecs;
                /* Protect against the host clock being set backwards */
-                if(delta < 0)
+                if(delta[c] < 0)
-                        delta = 0;
+                        delta[c] = 0;
-                ticks += (delta * HZ) / BILLION;
+                ticks += (delta[c] * HZ) / BILLION;
-                delta -= (ticks * BILLION) / HZ;
+                delta[c] -= (ticks * BILLION) / HZ;
        }
-        else prev_nsecs = os_nsecs();
+        else prev_nsecs[c] = os_nsecs();
 #else
        ticks = 1;
 #endif
@@ -69,8 +69,8 @@ void timer_irq(union uml_pt_regs *regs)
        }
 }
+/* Protects local_offset */
 static DEFINE_SPINLOCK(timer_spinlock);
 static unsigned long long local_offset = 0;
 static inline unsigned long long get_time(void)
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index b5f124a2f6ae..26f15c458574 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -128,7 +128,18 @@ out_of_memory:
        goto out;
 }
-void segv_handler(int sig, union uml_pt_regs *regs)
+static void bad_segv(struct faultinfo fi, unsigned long ip)
+{
+        struct siginfo si;
+        si.si_signo = SIGSEGV;
+        si.si_code = SEGV_ACCERR;
+        si.si_addr = (void __user *) FAULT_ADDRESS(fi);
+        current->thread.arch.faultinfo = fi;
+        force_sig_info(SIGSEGV, &si, current);
+}
+static void segv_handler(int sig, union uml_pt_regs *regs)
 {
        struct faultinfo * fi = UPT_FAULTINFO(regs);
@@ -205,17 +216,6 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, void *sc)
        return(0);
 }
-void bad_segv(struct faultinfo fi, unsigned long ip)
-{
-        struct siginfo si;
-        si.si_signo = SIGSEGV;
-        si.si_code = SEGV_ACCERR;
-        si.si_addr = (void __user *) FAULT_ADDRESS(fi);
-        current->thread.arch.faultinfo = fi;
-        force_sig_info(SIGSEGV, &si, current);
-}
 void relay_signal(int sig, union uml_pt_regs *regs)
 {
        if(arch_handle_signal(sig, regs))
@@ -232,14 +232,14 @@ void relay_signal(int sig, union uml_pt_regs *regs)
        force_sig(sig, current);
 }
-void bus_handler(int sig, union uml_pt_regs *regs)
+static void bus_handler(int sig, union uml_pt_regs *regs)
 {
        if(current->thread.fault_catcher != NULL)
                do_longjmp(current->thread.fault_catcher, 1);
        else relay_signal(sig, regs);
 }
-void winch(int sig, union uml_pt_regs *regs)
+static void winch(int sig, union uml_pt_regs *regs)
 {
        do_IRQ(WINCH_IRQ, regs);
 }
diff --git a/arch/um/kernel/tt/gdb.c b/arch/um/kernel/tt/gdb.c
index 786e4edd86c5..8eba8f7dca68 100644
--- a/arch/um/kernel/tt/gdb.c
+++ b/arch/um/kernel/tt/gdb.c
@@ -139,7 +139,7 @@ static void config_gdb_cb(void *arg)
        init_proxy(debugger_pid, 0, 0);
 }
-int gdb_config(char *str)
+int gdb_config(char *str, char **error_out)
 {
        struct gdb_data data;
@@ -154,7 +154,7 @@ void remove_gdb_cb(void *unused)
        exit_debugger_cb(NULL);
 }
-int gdb_remove(int unused)
+int gdb_remove(int unused, char **error_out)
 {
        initial_thread_cb(remove_gdb_cb, NULL);
        return 0;
diff --git a/arch/um/kernel/tt/gdb_kern.c b/arch/um/kernel/tt/gdb_kern.c
index 68e1bf63cd0a..03b06bc00771 100644
--- a/arch/um/kernel/tt/gdb_kern.c
+++ b/arch/um/kernel/tt/gdb_kern.c
@@ -8,10 +8,11 @@
 #ifdef CONFIG_MCONSOLE
-extern int gdb_config(char *str);
+extern int gdb_config(char *str, char **error_out);
-extern int gdb_remove(int n);
+extern int gdb_remove(int n, char **error_out);
 static struct mc_device gdb_mc = {
+        .list           = INIT_LIST_HEAD(gdb_mc.list),
        .name           = "gdb",
        .config         = gdb_config,
        .remove         = gdb_remove,
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 66f43c906821..89c6dba731f8 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -30,7 +30,6 @@
 #include "kern.h"
 #include "mem_user.h"
 #include "mem.h"
-#include "umid.h"
 #include "initrd.h"
 #include "init.h"
 #include "os.h"
@@ -44,9 +43,9 @@
 #define DEFAULT_COMMAND_LINE "root=98:0"
 /* Changed in linux_main and setup_arch, which run before SMP is started */
-static char command_line[COMMAND_LINE_SIZE] = { 0 };
+static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };
-static void add_arg(char *arg)
+static void __init add_arg(char *arg)
 {
        if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
                printf("add_arg: Too many command line arguments!\n");
@@ -331,7 +330,7 @@ EXPORT_SYMBOL(end_iomem);
 extern char __binary_start;
-int linux_main(int argc, char **argv)
+int __init linux_main(int argc, char **argv)
 {
        unsigned long avail, diff;
        unsigned long virtmem_size, max_physmem;
@@ -482,7 +481,7 @@ void __init setup_arch(char **cmdline_p)
        atomic_notifier_chain_register(&panic_notifier_list,
                        &panic_exit_notifier);
        paging_init();
-        strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+        strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
        setup_hostinfo();
 }
diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
index 4eaee823bfd2..039e16efcd55 100644
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
@@ -16,8 +16,10 @@ static int __init set_umid_arg(char *name, int *add)
 {
        int err;
-        if(umid_inited)
+        if(umid_inited){
+                printf("umid already set\n");
                return 0;
+        }
        *add = 0;
        err = set_umid(name);