Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / xtensa / Kconfig.debug

diff --git a/arch/xtensa/Kconfig.debug b/arch/xtensa/Kconfig.debug
index af7da74..8430af2 100644 (file)
--- a/arch/xtensa/Kconfig.debug
+++ b/arch/xtensa/Kconfig.debug
@@ -4,7 +4,7 @@ source "lib/Kconfig.debug"
 
 config DEBUG_TLB_SANITY
        bool "Debug TLB sanity"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && MMU
        help
          Enable this to turn on TLB sanity check on each entry to userspace.
          This check can spot missing TLB invalidation/wrong PTE permissions/
@@ -14,7 +14,7 @@ config DEBUG_TLB_SANITY
 
 config LD_NO_RELAX
        bool "Disable linker relaxation"
-       default n
+       default y
        help
          Enable this function to disable link-time optimizations.
          The default linker behavior is to combine identical literal