Merge ../scsi-rc-fixes-2.6

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 756a908c441d..d3679103a8e4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -71,7 +71,7 @@ config LOG_BUF_SHIFT
 
 config DETECT_SOFTLOCKUP
         bool "Detect Soft Lockups"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_KERNEL && !S390
         default y
         help
           Say Y here to enable the kernel to detect "soft lockups",
@@ -341,7 +341,7 @@ config FRAME_POINTER
 
 config UNWIND_INFO
         bool "Compile the kernel with frame unwind information"
-        depends on !IA64 && !PARISC
+        depends on !IA64 && !PARISC && !ARM
         depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
         help
           If you say Y here the resulting kernel image will be slightly larger
@@ -371,6 +371,20 @@ config FORCED_INLINING
           become the default in the future, until then this option is there to
           test gcc for this.
 
+config HEADERS_CHECK
+        bool "Run 'make headers_check' when building vmlinux"
+        depends on !UML
+        help
+          This option will extract the user-visible kernel headers whenever
+          building the kernel, and will run basic sanity checks on them to
+          ensure that exported files do not attempt to include files which
+          were not exported, etc.
+
+          If you're making modifications to header files which are
+          relevant for userspace, say 'Y', and check the headers
+          exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
+          your build tree), to make sure they're suitable.
+
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL