7 files changed, 25 insertions, 21 deletions

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 58650d098fb4..fd443852103c 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -1,10 +1,12 @@
 config UML
         bool
         default y
+        select ARCH_HAS_KCOV
         select HAVE_ARCH_AUDITSYSCALL
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_UID16
         select HAVE_FUTEX_CMPXCHG if FUTEX
+        select HAVE_DEBUG_KMEMLEAK
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES
         select GENERIC_IO
@@ -31,10 +33,9 @@ config PCI
 config PCMCIA
         bool
 
-# Yet to do!
 config TRACE_IRQFLAGS_SUPPORT
         bool
-        default n
+        default y
 
 config LOCKDEP_SUPPORT
         bool
diff --git a/arch/um/include/asm/irqflags.h b/arch/um/include/asm/irqflags.h
index c780d8a16773..3bb221e1d5a4 100644
--- a/arch/um/include/asm/irqflags.h
+++ b/arch/um/include/asm/irqflags.h
@@ -6,37 +6,33 @@ extern int set_signals(int enable);
 extern void block_signals(void);
 extern void unblock_signals(void);
 
+#define arch_local_save_flags arch_local_save_flags
 static inline unsigned long arch_local_save_flags(void)
 {
         return get_signals();
 }
 
+#define arch_local_irq_restore arch_local_irq_restore
 static inline void arch_local_irq_restore(unsigned long flags)
 {
         set_signals(flags);
 }
 
+#define arch_local_irq_enable arch_local_irq_enable
 static inline void arch_local_irq_enable(void)
 {
         unblock_signals();
 }
 
+#define arch_local_irq_disable arch_local_irq_disable
 static inline void arch_local_irq_disable(void)
 {
         block_signals();
 }
 
-static inline unsigned long arch_local_irq_save(void)
-{
-        unsigned long flags;
-        flags = arch_local_save_flags();
-        arch_local_irq_disable();
-        return flags;
-}
+#define ARCH_IRQ_DISABLED       0
+#define ARCh_IRQ_ENABLED        (SIGIO|SIGVTALRM)
 
-static inline bool arch_irqs_disabled(void)
-{
-        return arch_local_save_flags() == 0;
-}
+#include <asm-generic/irqflags.h>
 
 #endif
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index a6a5e42caaef..2f36d515762e 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -3,6 +3,11 @@
 # Licensed under the GPL
 #
 
+# Don't instrument UML-specific code; without this, we may crash when
+# accessing the instrumentation buffer for the first time from the
+# kernel.
+KCOV_INSTRUMENT                := n
+
 CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START)            \
                         -DELF_ARCH=$(LDS_ELF_ARCH)      \
                         -DELF_FORMAT=$(LDS_ELF_FORMAT)  \
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 55cead809b18..48bae81f8dca 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -37,8 +37,6 @@ static int __init read_initrd(void)
         }
 
         area = alloc_bootmem(size);
-        if (area == NULL)
-                return 0;
 
         if (load_initrd(initrd, area, size) == -1)
                 return 0;
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 16630e75f056..e8175a8aa22c 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -319,9 +319,6 @@ int __init linux_main(int argc, char **argv)
 
         start_vm = VMALLOC_START;
 
-        setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
-        mem_total_pages(physmem_size, iomem_size, highmem);
-
         virtmem_size = physmem_size;
         stack = (unsigned long) argv;
         stack &= ~(1024 * 1024 - 1);
@@ -334,7 +331,6 @@ int __init linux_main(int argc, char **argv)
                 printf("Kernel virtual memory size shrunk to %lu bytes\n",
                        virtmem_size);
 
-        stack_protections((unsigned long) &init_thread_info);
         os_flush_stdout();
 
         return start_uml();
@@ -342,6 +338,10 @@ int __init linux_main(int argc, char **argv)
 
 void __init setup_arch(char **cmdline_p)
 {
+        stack_protections((unsigned long) &init_thread_info);
+        setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
+        mem_total_pages(physmem_size, iomem_size, highmem);
+
         paging_init();
         strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
         *cmdline_p = command_line;
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index 08ff5094fcdd..ada473bf6f46 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -3,6 +3,9 @@
 # Licensed under the GPL
 #
 
+# Don't instrument UML-specific code
+KCOV_INSTRUMENT                := n
+
 obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
         registers.o sigio.o signal.o start_up.o time.o tty.o \
         umid.o user_syms.o util.o drivers/ skas/
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 8acaf4e384c0..a86d7cc2c2d8 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -15,6 +15,7 @@
 #include <kern_util.h>
 #include <os.h>
 #include <sysdep/mcontext.h>
+#include <um_malloc.h>
 
 void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
         [SIGTRAP]       = relay_signal,
@@ -32,7 +33,7 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
         struct uml_pt_regs *r;
         int save_errno = errno;
 
-        r = malloc(sizeof(struct uml_pt_regs));
+        r = uml_kmalloc(sizeof(struct uml_pt_regs), UM_GFP_ATOMIC);
         if (!r)
                 panic("out of memory");
 
@@ -91,7 +92,7 @@ static void timer_real_alarm_handler(mcontext_t *mc)
 {
         struct uml_pt_regs *regs;
 
-        regs = malloc(sizeof(struct uml_pt_regs));
+        regs = uml_kmalloc(sizeof(struct uml_pt_regs), UM_GFP_ATOMIC);
         if (!regs)
                 panic("out of memory");