summaryrefslogtreecommitdiffstats
path: root/arch/s390/mm
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@de.ibm.com>2012-08-21 12:36:34 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:44:50 +0200
commit648609e3f24599a5ad8d53df2ec13fbc37810bcc (patch)
treebd8a7694f53ab33a8c85cf52313905fa4f59454e /arch/s390/mm
parent535c611ddd3eb076f96579131e30bc5dd02a3b1c (diff)
downloadblackbird-op-linux-648609e3f24599a5ad8d53df2ec13fbc37810bcc.tar.gz
blackbird-op-linux-648609e3f24599a5ad8d53df2ec13fbc37810bcc.zip
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/mm')
-rw-r--r--arch/s390/mm/vmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 6f896e75ab49..c22abf900c9e 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -107,7 +107,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
pte = mk_pte_phys(address, __pgprot(ro ? _PAGE_RO : 0));
pm_dir = pmd_offset(pu_dir, address);
-#ifdef CONFIG_64BIT
+#if defined(CONFIG_64BIT) && !defined(CONFIG_DEBUG_PAGEALLOC)
if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) &&
(address + HPAGE_SIZE <= start + size) &&
(address >= HPAGE_SIZE)) {
OpenPOWER on IntegriCloud