projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.3/mtip32xx' into for-3.3/drivers
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
Kconfig.cputype
diff --git
a/arch/powerpc/platforms/Kconfig.cputype
b/arch/powerpc/platforms/Kconfig.cputype
index
e06e395
..
fbecae0
100644
(file)
--- a/
arch/powerpc/platforms/Kconfig.cputype
+++ b/
arch/powerpc/platforms/Kconfig.cputype
@@
-69,6
+69,7
@@
config PPC_BOOK3S_64
bool "Server processors"
select PPC_FPU
select PPC_HAVE_PMU_SUPPORT
bool "Server processors"
select PPC_FPU
select PPC_HAVE_PMU_SUPPORT
+ select SYS_SUPPORTS_HUGETLBFS
config PPC_BOOK3E_64
bool "Embedded processors"
config PPC_BOOK3E_64
bool "Embedded processors"
@@
-173,6
+174,7
@@
config BOOKE
config FSL_BOOKE
bool
depends on (E200 || E500) && PPC32
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
default y
# this is for common code between PPC32 & PPC64 FSL BOOKE
@@
-282,21
+284,13
@@
config PPC_MMU_NOHASH
def_bool y
depends on !PPC_STD_MMU
def_bool y
depends on !PPC_STD_MMU
-config PPC_MMU_NOHASH_32
- def_bool y
- depends on PPC_MMU_NOHASH && PPC32
-
-config PPC_MMU_NOHASH_64
- def_bool y
- depends on PPC_MMU_NOHASH && PPC64
-
config PPC_BOOK3E_MMU
def_bool y
depends on FSL_BOOKE || PPC_BOOK3E
config PPC_MM_SLICES
bool
config PPC_BOOK3E_MMU
def_bool y
depends on FSL_BOOKE || PPC_BOOK3E
config PPC_MM_SLICES
bool
- default y if
HUGETLB_PAGE
|| (PPC_STD_MMU_64 && PPC_64K_PAGES)
+ default y if
(PPC64 && HUGETLB_PAGE)
|| (PPC_STD_MMU_64 && PPC_64K_PAGES)
default n
config VIRT_CPU_ACCOUNTING
default n
config VIRT_CPU_ACCOUNTING