summaryrefslogtreecommitdiff
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-29 08:42:07 (GMT)
committerIngo Molnar <mingo@kernel.org>2016-02-29 08:42:07 (GMT)
commit6aa447bcbb444cd1b738613a20627f288d631665 (patch)
tree62030bb14be0006248181305ac1fe377a99e5b65 /arch/mips/Kconfig
parentabedf8e2419fb873d919dd74de2e84b510259339 (diff)
parent48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff)
downloadlinux-6aa447bcbb444cd1b738613a20627f288d631665.tar.xz
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 57a945e..74a3db9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2085,7 +2085,7 @@ config PAGE_SIZE_32KB
config PAGE_SIZE_64KB
bool "64kB"
- depends on !CPU_R3000 && !CPU_TX39XX
+ depends on !CPU_R3000 && !CPU_TX39XX && !CPU_R6000
help
Using 64kB page size will result in higher performance kernel at
the price of higher memory consumption. This option is available on