diff options
| author | Simon Horman <horms@verge.net.au> | 2008-09-10 09:14:52 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-10 09:14:52 +1000 |
| commit | c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24 (patch) | |
| tree | 1202d018129ca5538cd98b1e4542b239045c1a2d /arch/powerpc/include/asm/pgtable-ppc64.h | |
| parent | e9c0ce232e7a36daae1ca08282609d7f0c57c567 (diff) | |
| parent | 28faa979746b2352cd78a376bf9f52db953bda46 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'arch/powerpc/include/asm/pgtable-ppc64.h')
| -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 db0b8f3b880..4597c491e9b 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__ |