Merge branch 'master'

27 files changed, 146 insertions, 78 deletions

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 24790bed2054..a508e7a02891 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -159,6 +159,7 @@ archclean:
 $(SYMLINK_HEADERS):
         @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
+        $(Q)mkdir -p $(objtree)/include/asm-um
         $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
 else
         $(Q)cd $(TOPDIR)/$(dir $@) ; \
@@ -168,7 +169,7 @@ endif
 include/asm-um/arch:
         @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
-        $(Q)mkdir -p include/asm-um
+        $(Q)mkdir -p $(objtree)/include/asm-um
         $(Q)ln -fsn $(srctree)/include/asm-$(SUBARCH) include/asm-um/arch
 else
         $(Q)cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch
diff --git a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
index 04e3958266e0..dc36b222100b 100644
--- a/arch/um/drivers/cow.h
+++ b/arch/um/drivers/cow.h
@@ -46,7 +46,7 @@ extern int file_reader(__u64 offset, char *buf, int len, void *arg);
 extern int read_cow_header(int (*reader)(__u64, char *, int, void *),
                            void *arg, __u32 *version_out,
                            char **backing_file_out, time_t *mtime_out,
-                           __u64 *size_out, int *sectorsize_out,
+                           unsigned long long *size_out, int *sectorsize_out,
                            __u32 *align_out, int *bitmap_offset_out);
 
 extern int write_cow_header(char *cow_file, int fd, char *backing_file,
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index 94de4ead4f7a..7a5b4afde692 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -28,7 +28,7 @@ static inline int cow_seek_file(int fd, __u64 offset)
         return(os_seek_file(fd, offset));
 }
 
-static inline int cow_file_size(char *file, __u64 *size_out)
+static inline int cow_file_size(char *file, unsigned long long *size_out)
 {
         return(os_file_size(file, size_out));
 }
diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
index 61951b721268..0ec4052db9c5 100644
--- a/arch/um/drivers/cow_user.c
+++ b/arch/um/drivers/cow_user.c
@@ -17,30 +17,34 @@
 
 #define PATH_LEN_V1 256
 
+typedef __u32 time32_t;
+
 struct cow_header_v1 {
-        int magic;
-        int version;
+        __s32 magic;
+        __s32 version;
         char backing_file[PATH_LEN_V1];
-        time_t mtime;
+        time32_t mtime;
         __u64 size;
-        int sectorsize;
-};
+        __s32 sectorsize;
+} __attribute__((packed));
 
-#define PATH_LEN_V2 MAXPATHLEN
+/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
+ * case other systems have different values for MAXPATHLEN.
+ *
+ * The same must hold for V2 - we want file format compatibility, not anything
+ * else.
+ */
+#define PATH_LEN_V3 4096
+#define PATH_LEN_V2 PATH_LEN_V3
 
 struct cow_header_v2 {
         __u32 magic;
         __u32 version;
         char backing_file[PATH_LEN_V2];
-        time_t mtime;
+        time32_t mtime;
         __u64 size;
-        int sectorsize;
-};
-
-/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
- * case other systems have different values for MAXPATHLEN
- */
-#define PATH_LEN_V3 4096
+        __s32 sectorsize;
+} __attribute__((packed));
 
 /* Changes from V2 -
  *      PATH_LEN_V3 as described above
@@ -66,6 +70,15 @@ struct cow_header_v2 {
  *      Fixed (finally!) the rounding bug
  */
 
+/* Until Dec2005, __attribute__((packed)) was left out from the below
+ * definition, leading on 64-bit systems to 4 bytes of padding after mtime, to
+ * align size to 8-byte alignment.  This shifted all fields above (no padding
+ * was present on 32-bit, no other padding was added).
+ *
+ * However, this _can be detected_: it means that cow_format (always 0 until
+ * now) is shifted onto the first 4 bytes of backing_file, where it is otherwise
+ * impossible to find 4 zeros. -bb */
+
 struct cow_header_v3 {
         __u32 magic;
         __u32 version;
@@ -75,6 +88,18 @@ struct cow_header_v3 {
         __u32 alignment;
         __u32 cow_format;
         char backing_file[PATH_LEN_V3];
+} __attribute__((packed));
+
+/* This is the broken layout used by some 64-bit binaries. */
+struct cow_header_v3_broken {
+        __u32 magic;
+        __u32 version;
+        __s64 mtime;
+        __u64 size;
+        __u32 sectorsize;
+        __u32 alignment;
+        __u32 cow_format;
+        char backing_file[PATH_LEN_V3];
 };
 
 /* COW format definitions - for now, we have only the usual COW bitmap */
@@ -84,6 +109,7 @@ union cow_header {
         struct cow_header_v1 v1;
         struct cow_header_v2 v2;
         struct cow_header_v3 v3;
+        struct cow_header_v3_broken v3_b;
 };
 
 #define COW_MAGIC 0x4f4f4f4d  /* MOOO */
@@ -184,8 +210,9 @@ int write_cow_header(char *cow_file, int fd, char *backing_file,
 
         err = -EINVAL;
         if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+                /* Below, %zd is for a size_t value */
                 cow_printf("Backing file name \"%s\" is too long - names are "
-                           "limited to %d characters\n", backing_file,
+                           "limited to %zd characters\n", backing_file,
                            sizeof(header->backing_file) - 1);
                 goto out_free;
         }
@@ -300,7 +327,8 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
                 *align_out = *sectorsize_out;
                 file = header->v2.backing_file;
         }
-        else if(version == 3){
+        /* This is very subtle - see above at union cow_header definition */
+        else if(version == 3 && (*((int*)header->v3.backing_file) != 0)){
                 if(n < sizeof(header->v3)){
                         cow_printf("read_cow_header - failed to read V3 "
                                    "header\n");
@@ -310,9 +338,43 @@ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
                 *size_out = ntohll(header->v3.size);
                 *sectorsize_out = ntohl(header->v3.sectorsize);
                 *align_out = ntohl(header->v3.alignment);
+                if (*align_out == 0) {
+                        cow_printf("read_cow_header - invalid COW header, "
+                                   "align == 0\n");
+                }
                 *bitmap_offset_out = ROUND_UP(sizeof(header->v3), *align_out);
                 file = header->v3.backing_file;
         }
+        else if(version == 3){
+                cow_printf("read_cow_header - broken V3 file with"
+                           " 64-bit layout - recovering content.\n");
+
+                if(n < sizeof(header->v3_b)){
+                        cow_printf("read_cow_header - failed to read V3 "
+                                   "header\n");
+                        goto out;
+                }
+
+                /* this was used until Dec2005 - 64bits are needed to represent
+                 * 2038+. I.e. we can safely do this truncating cast.
+                 *
+                 * Additionally, we must use ntohl() instead of ntohll(), since
+                 * the program used to use the former (tested - I got mtime
+                 * mismatch "0 vs whatever").
+                 *
+                 * Ever heard about bug-to-bug-compatibility ? ;-) */
+                *mtime_out = (time32_t) ntohl(header->v3_b.mtime);
+
+                *size_out = ntohll(header->v3_b.size);
+                *sectorsize_out = ntohl(header->v3_b.sectorsize);
+                *align_out = ntohl(header->v3_b.alignment);
+                if (*align_out == 0) {
+                        cow_printf("read_cow_header - invalid COW header, "
+                                   "align == 0\n");
+                }
+                *bitmap_offset_out = ROUND_UP(sizeof(header->v3_b), *align_out);
+                file = header->v3_b.backing_file;
+        }
         else {
                 cow_printf("read_cow_header - invalid COW version\n");
                 goto out;
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 28e3760e8b98..6d7173fc55a3 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -62,7 +62,7 @@ static void mc_work_proc(void *unused)
         unsigned long flags;
 
         while(!list_empty(&mc_requests)){
-                local_save_flags(flags);
+                local_irq_save(flags);
                 req = list_entry(mc_requests.next, struct mconsole_entry,
                                  list);
                 list_del(&req->list);
@@ -87,7 +87,7 @@ static irqreturn_t mconsole_interrupt(int irq, void *dev_id,
                 if(req.cmd->context == MCONSOLE_INTR)
                         (*req.cmd->handler)(&req);
                 else {
-                        new = kmalloc(sizeof(*new), GFP_ATOMIC);
+                        new = kmalloc(sizeof(*new), GFP_NOWAIT);
                         if(new == NULL)
                                 mconsole_reply(&req, "Out of memory", 1, 0);
                         else {
@@ -415,7 +415,6 @@ static int mem_config(char *str)
 
                         unplugged = page_address(page);
                         if(unplug_index == UNPLUGGED_PER_PAGE){
-                                INIT_LIST_HEAD(&unplugged->list);
                                 list_add(&unplugged->list, &unplugged_pages);
                                 unplug_index = 0;
                         }
@@ -616,7 +615,7 @@ static void console_write(struct console *console, const char *string,
                 return;
 
         while(1){
-                n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index);
+                n = min((size_t) len, ARRAY_SIZE(console_buf) - console_index);
                 strncpy(&console_buf[console_index], string, n);
                 console_index += n;
                 string += n;
@@ -655,7 +654,6 @@ static void with_console(struct mc_request *req, void (*proc)(void *),
         struct mconsole_entry entry;
         unsigned long flags;
 
-        INIT_LIST_HEAD(&entry.list);
         entry.request = *req;
         list_add(&entry.list, &clients);
         spin_lock_irqsave(&console_lock, flags);
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 0e2f06187ea7..0a7786e00cfb 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -182,7 +182,9 @@ static int change_tramp(char **argv, char *output, int output_len)
         pe_data.stdout = fds[1];
         pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
 
-        read_output(fds[0], output, output_len);
+        if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
+                read_output(fds[0], output, output_len);
+
         os_close_file(fds[0]);
         os_close_file(fds[1]);
 
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index b94c66114bc8..33c5f6e625e8 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -104,7 +104,7 @@ static void slirp_close(int fd, void *data)
         }
 
         if(err == 0) {
-                printk("slirp_close: process %d has not exited\n");
+                printk("slirp_close: process %d has not exited\n", pri->pid);
                 return;
         }
 
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 42557130a408..efa3d33c0be6 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -117,10 +117,6 @@ extern struct task_struct *get_task(int pid, int require);
 extern void machine_halt(void);
 extern int is_syscall(unsigned long addr);
 
-extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
-
-extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
-
 extern void free_irq(unsigned int, void *);
 extern int cpu(void);
 
diff --git a/arch/um/include/tt/tt.h b/arch/um/include/tt/tt.h
index 808521980186..acb8356e1f98 100644
--- a/arch/um/include/tt/tt.h
+++ b/arch/um/include/tt/tt.h
@@ -19,7 +19,8 @@ extern int fork_tramp(void *sig_stack);
 extern int do_proc_op(void *t, int proc_id);
 extern int tracer(int (*init_proc)(void *), void *sp);
 extern void attach_process(int pid);
-extern void tracer_panic(char *format, ...);
+extern void tracer_panic(char *format, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern void set_init_pid(int pid);
 extern int set_user_mode(void *task);
 extern void set_tracing(void *t, int tracing);
diff --git a/arch/um/include/user.h b/arch/um/include/user.h
index 91b0ac4ad88c..39f8c8801076 100644
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
@@ -6,8 +6,10 @@
 #ifndef __USER_H__
 #define __USER_H__
 
-extern void panic(const char *fmt, ...);
-extern int printk(const char *fmt, ...);
+extern void panic(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
+extern int printk(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern void schedule(void);
 extern void *um_kmalloc(int size);
 extern void *um_kmalloc_atomic(int size);
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index fe0c29b5144d..802d7842514d 100644
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -55,7 +55,8 @@ extern int get_pty(void);
 extern void *um_kmalloc(int size);
 extern int switcheroo(int fd, int prot, void *from, void *to, int size);
 extern void do_exec(int old_pid, int new_pid);
-extern void tracer_panic(char *msg, ...);
+extern void tracer_panic(char *msg, ...)
+        __attribute__ ((format (printf, 1, 2)));
 extern int detach(int pid, int sig);
 extern int attach(int pid);
 extern void kill_child_dead(int pid);
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 7713e7a6f476..432cf0b97a13 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(um_virt_to_phys);
 EXPORT_SYMBOL(mode_tt);
 EXPORT_SYMBOL(handle_page_fault);
 EXPORT_SYMBOL(find_iomem);
-EXPORT_SYMBOL(end_iomem);
 
 #ifdef CONFIG_MODE_TT
 EXPORT_SYMBOL(strncpy_from_user_tt);
@@ -89,12 +88,10 @@ EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(do_gettimeofday);
 EXPORT_SYMBOL(do_settimeofday);
 
-/* This is here because UML expands open to sys_open, not to a system
+/* This is here because UML expands lseek to sys_lseek, not to a system
  * call instruction.
  */
-EXPORT_SYMBOL(sys_open);
 EXPORT_SYMBOL(sys_lseek);
-EXPORT_SYMBOL(sys_read);
 EXPORT_SYMBOL(sys_wait4);
 
 #ifdef CONFIG_SMP
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 901b85e8a1c6..8f49507e64ef 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -40,7 +40,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                         int fd)
 {
         struct addr_change change;
-        void *output;
+        char *output;
         int n;
 
         change.what = op;
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 6490a4ff40ac..6987d1d247a2 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -43,7 +43,7 @@ static int helper_child(void *arg)
                 (*data->pre_exec)(data->pre_data);
         execvp(argv[0], argv);
         errval = errno;
-        printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
+        printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno);
         os_write_file(data->fd, &errval, sizeof(errval));
         kill(os_getpid(), SIGKILL);
         return(0);
@@ -92,15 +92,15 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
         close(fds[1]);
         fds[1] = -1;
 
-        /*Read the errno value from the child.*/
+        /* Read the errno value from the child, if the exec failed, or get 0 if
+         * the exec succeeded because the pipe fd was set as close-on-exec. */
         n = os_read_file(fds[0], &ret, sizeof(ret));
-        if(n < 0){
+        if (n < 0) {
                 printk("run_helper : read on pipe failed, ret = %d\n", -n);
                 ret = n;
                 kill(pid, SIGKILL);
                 CATCH_EINTR(waitpid(pid, NULL, 0));
-        }
-        else if(n != 0){
+        } else if(n != 0){
                 CATCH_EINTR(n = waitpid(pid, NULL, 0));
                 ret = -errno;
         } else {
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 6ab372da9657..71bb90a7606d 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -53,33 +53,36 @@ static void __init find_tempdir(void)
  */
 int make_tempfile(const char *template, char **out_tempname, int do_unlink)
 {
-        char tempname[MAXPATHLEN];
+        char *tempname;
         int fd;
 
+        tempname = malloc(MAXPATHLEN);
+
         find_tempdir();
-        if (*template != '/')
+        if (template[0] != '/')
                 strcpy(tempname, tempdir);
         else
-                *tempname = 0;
+                tempname[0] = '\0';
         strcat(tempname, template);
         fd = mkstemp(tempname);
         if(fd < 0){
                 fprintf(stderr, "open - cannot create %s: %s\n", tempname,
                         strerror(errno));
-                return -1;
+                goto out;
         }
         if(do_unlink && (unlink(tempname) < 0)){
                 perror("unlink");
-                return -1;
+                goto out;
         }
         if(out_tempname){
-                *out_tempname = strdup(tempname);
-                if(*out_tempname == NULL){
-                        perror("strdup");
-                        return -1;
-                }
+                *out_tempname = tempname;
+        } else {
+                free(tempname);
         }
         return(fd);
+out:
+        free(tempname);
+        return -1;
 }
 
 #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 9ba942947146..00e9388e947a 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -304,8 +304,8 @@ out_clear_poll:
                                            .size        = 0,
                                            .used        = 0 });
 out_free:
-        kfree(p);
         sigio_unlock();
+        kfree(p);
 out_close2:
         close(l_sigio_private[0]);
         close(l_sigio_private[1]);
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index fbb080c2fc26..b3c11cfa995a 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -82,8 +82,8 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
         if (offset) {
                 data = (unsigned long *)(mm_idp->stack +
                                          offset - UML_CONFIG_STUB_DATA);
-                printk("do_syscall_stub : ret = %d, offset = %d, "
-                       "data = 0x%x\n", ret, offset, data);
+                printk("do_syscall_stub : ret = %ld, offset = %ld, "
+                       "data = %p\n", ret, offset, data);
                 syscall = (unsigned long *)((unsigned long)data + data[0]);
                 printk("do_syscall_stub: syscall %ld failed, return value = "
                        "0x%lx, expected return value = 0x%lx\n",
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index bbf34cb91ce1..045ae0037456 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -265,7 +265,7 @@ void userspace(union uml_pt_regs *regs)
                 if(err)
                         panic("userspace - could not resume userspace process, "
                               "pid=%d, ptrace operation = %d, errno = %d\n",
-                              op, errno);
+                              pid, op, errno);
 
                 CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED));
                 if(err < 0)
@@ -369,7 +369,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
          */
         wait_stub_done(pid, -1, "copy_context_skas0");
         if (child_data->err != UML_CONFIG_STUB_DATA)
-                panic("copy_context_skas0 - stub-child reports error %d\n",
+                panic("copy_context_skas0 - stub-child reports error %ld\n",
                       child_data->err);
 
         if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL,
diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c
index ba21f0e04a2f..120abbe4e3ce 100644
--- a/arch/um/os-Linux/sys-i386/tls.c
+++ b/arch/um/os-Linux/sys-i386/tls.c
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include <linux/unistd.h>
 #include "sysdep/tls.h"
 #include "user_util.h"
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c
index 198e59163288..34bfc1bb9e38 100644
--- a/arch/um/os-Linux/umid.c
+++ b/arch/um/os-Linux/umid.c
@@ -120,7 +120,8 @@ static int not_dead_yet(char *dir)
 
         dead = 0;
         fd = open(file, O_RDONLY);
-        if(fd < 0){
+        if(fd < 0) {
+                fd = -errno;
                 if(fd != -ENOENT){
                         printk("not_dead_yet : couldn't open pid file '%s', "
                                "err = %d\n", file, -fd);
@@ -130,9 +131,13 @@ static int not_dead_yet(char *dir)
 
         err = 0;
         n = read(fd, pid, sizeof(pid));
-        if(n <= 0){
+        if(n < 0){
+                printk("not_dead_yet : couldn't read pid file '%s', "
+                       "err = %d\n", file, errno);
+                goto out_close;
+        } else if(n == 0){
                 printk("not_dead_yet : couldn't read pid file '%s', "
-                       "err = %d\n", file, -n);
+                       "0-byte read\n", file);
                 goto out_close;
         }
 
@@ -155,9 +160,9 @@ static int not_dead_yet(char *dir)
 
         return err;
 
- out_close:
+out_close:
         close(fd);
- out:
+out:
         return 0;
 }
 
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 8da6ab31152a..2598158e1f53 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -18,14 +18,19 @@ extern void *memmove(void *, const void *, size_t);
 extern void *memset(void *, int, size_t);
 extern int printf(const char *, ...);
 
+/* If they're not defined, the export is included in lib/string.c.*/
+#ifdef __HAVE_ARCH_STRLEN
 EXPORT_SYMBOL(strlen);
+#endif
+#ifdef __HAVE_ARCH_STRSTR
+EXPORT_SYMBOL(strstr);
+#endif
+
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(printf);
 
-EXPORT_SYMBOL(strstr);
-
 /* Here, instead, I can provide a fake prototype. Yes, someone cares: genksyms.
  * However, the modules will use the CRC defined *here*, no matter if it is
  * good; so the versions of these symbols will always match
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index b696b451774c..5e7a9c310aa5 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -9,10 +9,8 @@ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 $(USER_OBJS) $(USER_OBJS:.o=.i) $(USER_OBJS:.o=.s) $(USER_OBJS:.o=.lst): \
         c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(notdir $@))
-$(USER_OBJS): cmd_checksrc =
-$(USER_OBJS): quiet_cmd_checksrc =
-$(USER_OBJS): cmd_force_checksrc =
-$(USER_OBJS): quiet_cmd_force_checksrc =
+$(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
+        -Dunix -D__unix__ -D__$(SUBARCH)__
 
 
 # The stubs and unmap.o can't try to call mcount or update basic block data
diff --git a/arch/um/sys-i386/ksyms.c b/arch/um/sys-i386/ksyms.c
index db524ab3f743..2a1eac1859ce 100644
--- a/arch/um/sys-i386/ksyms.c
+++ b/arch/um/sys-i386/ksyms.c
@@ -15,7 +15,3 @@ EXPORT_SYMBOL(__up_wakeup);
 
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial);
-
-/* delay core functions */
-EXPORT_SYMBOL(__const_udelay);
-EXPORT_SYMBOL(__udelay);
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 9f3bd8ed78f5..40aa88531446 100644
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -57,7 +57,7 @@ static void write_debugregs(int pid, unsigned long *regs)
                 if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
                           regs[i]) < 0)
                         printk("write_debugregs - ptrace failed on "
-                               "register %d, value = 0x%x, errno = %d\n", i,
+                               "register %d, value = 0x%lx, errno = %d\n", i,
                                regs[i], errno);
         }
 }
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index f5d0e1c37ea2..618fd8594643 100644
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
@@ -147,7 +147,7 @@ int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate __user *fp,
          * delivery.  The sp passed in is the original, and this needs
          * to be restored, so we stick it in separately.
          */
-        err |= copy_to_user(&SC_SP(to), sp, sizeof(sp));
+        err |= copy_to_user(&SC_SP(to), &sp, sizeof(sp));
 
         if(from_fp != NULL){
                 err |= copy_to_user(&to->fpstate, &to_fp, sizeof(to->fpstate));
diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c
index a3188e861cc7..71b9796258ef 100644
--- a/arch/um/sys-i386/tls.c
+++ b/arch/um/sys-i386/tls.c
@@ -378,7 +378,7 @@ static int __init __setup_host_supports_tls(void) {
         } else
                 printk(KERN_ERR "  Host TLS support NOT detected! "
                                 "TLS support inside UML will not work\n");
-        return 1;
+        return 0;
 }
 
 __initcall(__setup_host_supports_tls);
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index e75c4e1838b0..a4c46a8af008 100644
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -137,7 +137,7 @@ int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate *fp,
          * delivery.  The sp passed in is the original, and this needs
          * to be restored, so we stick it in separately.
          */
-        err |= copy_to_user(&SC_SP(to), sp, sizeof(sp));
+        err |= copy_to_user(&SC_SP(to), &sp, sizeof(sp));
 
         if(from_fp != NULL){
                 err |= copy_to_user(&to->fpstate, &to_fp, sizeof(to->fpstate));