diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-09-03 05:12:05 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-03 12:53:42 +0200 |
| commit | 94ee815c05c9387931e549d83312d30009ed86e9 (patch) | |
| tree | fd577e77c7fddd8ed77947c9bf198a5827af3a7e | |
| parent | powerpc: Work around gcc's -fno-omit-frame-pointer bug (diff) | |
| download | linux-94ee815c05c9387931e549d83312d30009ed86e9.tar.xz linux-94ee815c05c9387931e549d83312d30009ed86e9.zip | |
powerpc: Fix build error with 64K pages and !hugetlbfs
HAVE_ARCH_UNMAPPED_AREA and HAVE_ARCH_UNMAPPED_AREA_TOPDOWN must
be defined whenever CONFIG_PPC_MM_SLICES is enabled, not just when
CONFIG_HUGETLB_PAGE is. They used to be always defined together but
this is no longer the case since 3a8247cc2c856930f34eafce33f6a039227ee175
("powerpc: Only demote individual slices rather than whole process").
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/include/asm/pgtable-ppc64.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index db0b8f3b8807..4597c491e9b5 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h @@ -153,12 +153,10 @@ #define __S110 PAGE_SHARED_X #define __S111 PAGE_SHARED_X -#ifdef CONFIG_HUGETLB_PAGE - +#ifdef CONFIG_PPC_MM_SLICES #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN - -#endif +#endif /* CONFIG_PPC_MM_SLICES */ #ifndef __ASSEMBLY__ |