diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 13:20:34 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 13:20:34 +1100 |
| commit | faa8bf8878636e40646d307e0516dbadb3b65b4f (patch) | |
| tree | 2f9736f1ec827ad80a3fd61af5846e664ded2ab1 /arch/powerpc/platforms | |
| parent | 48b1bf86c308532669571e929619e98a8d88ef54 (diff) | |
| parent | 1f6820b4c1d09b017625ce32ba23fa39ebfdb27a (diff) | |
| download | op-kernel-dev-faa8bf8878636e40646d307e0516dbadb3b65b4f.zip op-kernel-dev-faa8bf8878636e40646d307e0516dbadb3b65b4f.tar.gz | |
Merge branch 'booke-hugetlb' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 836b442..425db18 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -174,7 +174,6 @@ config BOOKE config FSL_BOOKE bool depends on (E200 || E500) && PPC32 - select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT default y # this is for common code between PPC32 & PPC64 FSL BOOKE @@ -182,6 +181,7 @@ config PPC_FSL_BOOK3E bool select FSL_EMB_PERFMON select PPC_SMP_MUXED_IPI + select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64 default y if FSL_BOOKE config PTE_64BIT @@ -309,7 +309,7 @@ config PPC_BOOK3E_MMU config PPC_MM_SLICES bool - default y if (PPC64 && HUGETLB_PAGE) || (PPC_STD_MMU_64 && PPC_64K_PAGES) + default y if (!PPC_FSL_BOOK3E && PPC64 && HUGETLB_PAGE) || (PPC_STD_MMU_64 && PPC_64K_PAGES) default n config VIRT_CPU_ACCOUNTING |
