Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 20 insertions, 5 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index e49e9e0c69fd..2d92c2cf92d7 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -82,7 +82,8 @@ asm(
         "       lm      6,15,24(15)\n"
 #endif
         "       br      14\n"
-        "       .size   savesys_ipl_nss, .-savesys_ipl_nss\n");
+        "       .size   savesys_ipl_nss, .-savesys_ipl_nss\n"
+        "       .previous\n");
 
 static __initdata char upper_command_line[COMMAND_LINE_SIZE];
 
@@ -214,10 +215,13 @@ static __initdata struct sysinfo_3_2_2 vmms __aligned(PAGE_SIZE);
 
 static noinline __init void detect_machine_type(void)
 {
-        /* No VM information? Looks like LPAR */
-        if (stsi(&vmms, 3, 2, 2) == -ENOSYS)
+        /* Check current-configuration-level */
+        if ((stsi(NULL, 0, 0, 0) >> 28) <= 2) {
+                S390_lowcore.machine_flags |= MACHINE_FLAG_LPAR;
                 return;
-        if (!vmms.count)
+        }
+        /* Get virtual-machine cpu information. */
+        if (stsi(&vmms, 3, 2, 2) == -ENOSYS || !vmms.count)
                 return;
 
         /* Running under KVM? If not we assume z/VM */
@@ -402,8 +406,19 @@ static void __init append_to_cmdline(size_t (*ipl_data)(char *, size_t))
 
 static void __init setup_boot_command_line(void)
 {
+        int i;
+
+        /* convert arch command line to ascii */
+        for (i = 0; i < ARCH_COMMAND_LINE_SIZE; i++)
+                if (COMMAND_LINE[i] & 0x80)
+                        break;
+        if (i < ARCH_COMMAND_LINE_SIZE)
+                EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);
+        COMMAND_LINE[ARCH_COMMAND_LINE_SIZE-1] = 0;
+
         /* copy arch command line */
-        strlcpy(boot_command_line, COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);
+        strlcpy(boot_command_line, strstrip(COMMAND_LINE),
+                ARCH_COMMAND_LINE_SIZE);
 
         /* append IPL PARM data to the boot command line */
         if (MACHINE_IS_VM)