1 files changed, 5 insertions, 9 deletions

diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 36d89cf8d20b..e1062ec36d40 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -21,7 +21,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 #include "asm/smp.h"
 #include "asm/processor.h"
 #include "asm/spinlock.h"
-#include "kern_util.h"
 #include "kern.h"
 #include "irq_user.h"
 #include "os.h"
@@ -61,7 +60,7 @@ void smp_send_stop(void)
                         continue;
                 os_write_file(cpu_data[i].ipi_pipe[1], "S", 1);
         }
-        printk(KERN_INFO "done\n");
+        printk(KERN_CONT "done\n");
 }
 
 static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
@@ -75,8 +74,7 @@ static int idle_proc(void *cpup)
         if (err < 0)
                 panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err);
 
-        os_set_fd_async(cpu_data[cpu].ipi_pipe[0],
-                     current->thread.mode.tt.extern_pid);
+        os_set_fd_async(cpu_data[cpu].ipi_pipe[0]);
 
         wmb();
         if (cpu_test_and_set(cpu, cpu_callin_map)) {
@@ -129,8 +127,7 @@ void smp_prepare_cpus(unsigned int maxcpus)
         if (err < 0)
                 panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
 
-        os_set_fd_async(cpu_data[me].ipi_pipe[0],
-                     current->thread.mode.tt.extern_pid);
+        os_set_fd_async(cpu_data[me].ipi_pipe[0]);
 
         for (cpu = 1; cpu < ncpus; cpu++) {
                 printk(KERN_INFO "Booting processor %d...\n", cpu);
@@ -143,9 +140,8 @@ void smp_prepare_cpus(unsigned int maxcpus)
                 while (waittime-- && !cpu_isset(cpu, cpu_callin_map))
                         cpu_relax();
 
-                if (cpu_isset(cpu, cpu_callin_map))
-                        printk(KERN_INFO "done\n");
-                else printk(KERN_INFO "failed\n");
+                printk(KERN_INFO "%s\n",
+                       cpu_isset(cpu, cpu_calling_map) ? "done" : "failed");
         }
 }