aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-08-31 07:35:25 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 09:45:04 -0400
commit3d5787c9976889bcf26cbd8f3124b91678a33275 (patch)
treefe99283870a3595e9dfd8302a13e5778178e4067
parentc5e3acd666543544d402c83d24d44e487fb51f11 (diff)
s390/mm: change default addressing mode
Change the default addressing mode so that user space runs in primary space and the kernel runs in home space. In addition remove the "switch_amode" kernel parameter so all users who already specified they want the new default behaviour will stay in the "switched" mode instead of in the opposite they intended. If there is a need to switch addressing modes, this can be done with the "user_mode" kernel parameter: user_mode=home Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/setup.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 7b59fff85f2f..39d609b582ca 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -302,7 +302,7 @@ static int __init parse_vmalloc(char *arg)
302} 302}
303early_param("vmalloc", parse_vmalloc); 303early_param("vmalloc", parse_vmalloc);
304 304
305unsigned int addressing_mode = HOME_SPACE_MODE; 305unsigned int addressing_mode = PRIMARY_SPACE_MODE;
306EXPORT_SYMBOL_GPL(addressing_mode); 306EXPORT_SYMBOL_GPL(addressing_mode);
307 307
308static int set_amode_primary(void) 308static int set_amode_primary(void)
@@ -323,16 +323,6 @@ static int set_amode_primary(void)
323 } 323 }
324} 324}
325 325
326/*
327 * Switch kernel/user addressing modes?
328 */
329static int __init early_parse_switch_amode(char *p)
330{
331 addressing_mode = PRIMARY_SPACE_MODE;
332 return 0;
333}
334early_param("switch_amode", early_parse_switch_amode);
335
336static int __init early_parse_user_mode(char *p) 326static int __init early_parse_user_mode(char *p)
337{ 327{
338 if (p && strcmp(p, "primary") == 0) 328 if (p && strcmp(p, "primary") == 0)