---

yaml --- r: 77191 b: refs/heads/master c: 08d0796 h: refs/heads/master i: 77189: b7b4f61 77187: 4d6b63b 77183: 9c3dbdd v: v3
git-mirror · Jan 26, 2008 · d23025f · d23025f
1 parent 73166d6
commit d23025f
Show file tree

Hide file tree

Showing 9 changed files with 676 additions and 194 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c05ffc4f2b208da8ba7d3a9b5ab886c76f8939b5
+refs/heads/master: 08d07968277cd898c88bf12b7720d89c02c4f139
diff --git a/trunk/arch/s390/kernel/early.c b/trunk/arch/s390/kernel/early.c
@@ -276,8 +276,9 @@ void __init startup_init(void)
 	create_kernel_nss();
 	sort_main_extable();
 	setup_lowcore_early();
-	sclp_readinfo_early();
+	sclp_read_info_early();
 	sclp_facilities_detect();
+	sclp_read_cpu_info_early();
 	memsize = sclp_memory_detect();
 #ifndef CONFIG_64BIT
 	/*

diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
@@ -920,7 +920,7 @@ setup_arch(char **cmdline_p)
 
 void __cpuinit print_cpu_info(struct cpuinfo_S390 *cpuinfo)
 {
-   printk("cpu %d "
+   printk(KERN_INFO "cpu %d "
 #ifdef CONFIG_SMP
            "phys_idx=%d "
 #endif