Merge branch 'master' into for-linus

1 files changed, 16 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7dbd5d9c29a4..d57b12f59c8c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -338,7 +338,7 @@ config SLUB_STATS
 
 config DEBUG_KMEMLEAK
         bool "Kernel memory leak detector"
-        depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM) && \
+        depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM || PPC) && \
                 !MEMORY_HOTPLUG
         select DEBUG_FS if SYSFS
         select STACKTRACE if STACKTRACE_SUPPORT
@@ -805,6 +805,21 @@ config DEBUG_BLOCK_EXT_DEVT
 
           Say N if you are unsure.
 
+config DEBUG_FORCE_WEAK_PER_CPU
+        bool "Force weak per-cpu definitions"
+        depends on DEBUG_KERNEL
+        help
+          s390 and alpha require percpu variables in modules to be
+          defined weak to work around addressing range issue which
+          puts the following two restrictions on percpu variable
+          definitions.
+
+          1. percpu symbols must be unique whether static or not
+          2. percpu variables can't be defined inside a function
+
+          To ensure that generic code follows the above rules, this
+          option forces all percpu variables to be defined as weak.
+
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
         depends on DEBUG_KERNEL