manual update from upstream:

Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 24 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 016e89a44ac8..156822e3cc79 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -128,7 +128,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
         depends on BUG
-        depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || (X86 && !X86_64) || FRV
+        depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV
         default !EMBEDDED
         help
           Say Y here to make BUG() panics output the file name and line number
@@ -168,13 +168,34 @@ config DEBUG_FS
 
           If unsure, say N.
 
+config DEBUG_VM
+        bool "Debug VM"
+        depends on DEBUG_KERNEL
+        help
+          Enable this to debug the virtual-memory system.
+
+          If unsure, say N.
+
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
         depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML)
         default y if DEBUG_INFO && UML
         help
           If you say Y here the resulting kernel image will be slightly larger
-          and slower, but it might give very useful debugging information
-          on some architectures or you use external debuggers.
+          and slower, but it might give very useful debugging information on
+          some architectures or if you use external debuggers.
           If you don't debug the kernel, you can say N.
 
+config RCU_TORTURE_TEST
+        tristate "torture tests for RCU"
+        depends on DEBUG_KERNEL
+        default n
+        help
+          This option provides a kernel module that runs torture tests
+          on the RCU infrastructure.  The kernel module may be built
+          after the fact on the running kernel to be tested, if desired.
+
+          Say Y here if you want RCU torture tests to start automatically
+          at boot time (you probably don't).
+          Say M if you want the RCU torture tests to build as a module.
+          Say N if you are unsure.