uml: style fixes in arch/um/kernel

Joe Perches noticed some printks in smp.c that needed fixing.

While I was in there, I did the usual tidying in arch/um/kernel, which
should be fairly style-clean at this point:
	copyright updates
	emacs formatting comments removal
	include tidying
	style fixes

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 869ac6802209..e1062ec36d40 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -60,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;
@@ -140,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");
         }
 }