From b9c50ad3b6e5c9d4605b15dc06ca6170ec458cdc Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 31 Aug 2012 13:35:25 +0200
Subject: [PATCH] --- yaml --- r: 324077 b: refs/heads/master c:
 3d5787c9976889bcf26cbd8f3124b91678a33275 h: refs/heads/master i:   324075:
 2551ae90e3c9a2fbc12d3f568ce0b2869a25a570 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/s390/kernel/setup.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 8160c2df014b..5b7516f9bfc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5e3acd666543544d402c83d24d44e487fb51f11
+refs/heads/master: 3d5787c9976889bcf26cbd8f3124b91678a33275
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 7b59fff85f2f..39d609b582ca 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -302,7 +302,7 @@ static int __init parse_vmalloc(char *arg)
 }
 early_param("vmalloc", parse_vmalloc);
 
-unsigned int addressing_mode = HOME_SPACE_MODE;
+unsigned int addressing_mode = PRIMARY_SPACE_MODE;
 EXPORT_SYMBOL_GPL(addressing_mode);
 
 static int set_amode_primary(void)
@@ -323,16 +323,6 @@ static int set_amode_primary(void)
 	}
 }
 
-/*
- * Switch kernel/user addressing modes?
- */
-static int __init early_parse_switch_amode(char *p)
-{
-	addressing_mode = PRIMARY_SPACE_MODE;
-	return 0;
-}
-early_param("switch_amode", early_parse_switch_amode);
-
 static int __init early_parse_user_mode(char *p)
 {
 	if (p && strcmp(p, "primary") == 0)