---

yaml --- r: 362127 b: refs/heads/master c: 383c97b h: refs/heads/master i: 362125: b025c34 362123: bf4ba94 362119: 434a936 362111: a1d7791 v: v3
git-mirror · Mar 12, 2013 · 02c296e · 02c296e
1 parent 5b92f03
commit 02c296e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f91e5064c6c24d6ccd760a6b6120de4560d9829
+refs/heads/master: 383c97b4587665d47d08dff37ec85b44be760505
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -18,7 +18,7 @@ config MIPS
 	select HAVE_KRETPROBES
 	select HAVE_DEBUG_KMEMLEAK
 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
-	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 	select RTC_LIB if !MACH_LOONGSON
 	select GENERIC_ATOMIC64 if !64BIT
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE