aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/early.c
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2012-08-21 06:36:34 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 09:44:50 -0400
commit648609e3f24599a5ad8d53df2ec13fbc37810bcc (patch)
treebd8a7694f53ab33a8c85cf52313905fa4f59454e /arch/s390/kernel/early.c
parent535c611ddd3eb076f96579131e30bc5dd02a3b1c (diff)
s390: enable large page support with CONFIG_DEBUG_PAGEALLOC
So far, large page support was completely disabled with CONFIG_DEBUG_PAGEALLOC, although it would be sufficient if only the large page kernel mapping was disabled. This patch enables large page support with CONFIG_DEBUG_PAGEALLOC, while it prevents the large kernel mapping in that case. Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/early.c')
-rw-r--r--arch/s390/kernel/early.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 83c3271c442b..e48407962b0f 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -267,12 +267,10 @@ static noinline __init void setup_facility_list(void)
267 267
268static noinline __init void setup_hpage(void) 268static noinline __init void setup_hpage(void)
269{ 269{
270#ifndef CONFIG_DEBUG_PAGEALLOC
271 if (!test_facility(2) || !test_facility(8)) 270 if (!test_facility(2) || !test_facility(8))
272 return; 271 return;
273 S390_lowcore.machine_flags |= MACHINE_FLAG_HPAGE; 272 S390_lowcore.machine_flags |= MACHINE_FLAG_HPAGE;
274 __ctl_set_bit(0, 23); 273 __ctl_set_bit(0, 23);
275#endif
276} 274}
277 275
278static __init void detect_mvpg(void) 276static __init void detect_mvpg(void)