diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 06:20:34 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 06:20:34 +0400 |
commit | faa8bf8878636e40646d307e0516dbadb3b65b4f (patch) | |
tree | 2f9736f1ec827ad80a3fd61af5846e664ded2ab1 /arch/powerpc/include/asm/page_64.h | |
parent | 48b1bf86c308532669571e929619e98a8d88ef54 (diff) | |
parent | 1f6820b4c1d09b017625ce32ba23fa39ebfdb27a (diff) | |
download | linux-faa8bf8878636e40646d307e0516dbadb3b65b4f.tar.xz |
Merge branch 'booke-hugetlb' into next
Diffstat (limited to 'arch/powerpc/include/asm/page_64.h')
-rw-r--r-- | arch/powerpc/include/asm/page_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h index fb40ede6bc0d..fed85e6290e1 100644 --- a/arch/powerpc/include/asm/page_64.h +++ b/arch/powerpc/include/asm/page_64.h @@ -130,7 +130,9 @@ do { \ #ifdef CONFIG_HUGETLB_PAGE +#ifdef CONFIG_PPC_MM_SLICES #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA +#endif #endif /* !CONFIG_HUGETLB_PAGE */ |