Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: Select frame pointers on x86
  dma-debug: be more careful when building reference entries
  dma-debug: check for sg_call_ents in best-fit algorithm too

diff --combined lib/Kconfig.debug
index 6b0c2d8a21294e9de3a1ca3738134746c035f2d5,3be4b7caf5b8c2ceb29f0aee2150db70cb9b892c..23067ab1a73cdb471102e0b3b874d724396cf391
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -300,7 -300,7 +300,7 @@@ config DEBUG_OBJECTS_ENABLE_DEFAUL
  
  config DEBUG_SLAB
        bool "Debug slab memory allocations"
 -      depends on DEBUG_KERNEL && SLAB
 +      depends on DEBUG_KERNEL && SLAB && !KMEMCHECK
        help
          Say Y here to have the kernel do limited verification on memory
          allocation as well as poisoning memory on free to catch use of freed
@@@ -312,7 -312,7 +312,7 @@@ config DEBUG_SLAB_LEA
  
  config SLUB_DEBUG_ON
        bool "SLUB debugging on by default"
 -      depends on SLUB && SLUB_DEBUG
 +      depends on SLUB && SLUB_DEBUG && !KMEMCHECK
        default n
        help
          Boot with debugging on by default. SLUB boots by default with
@@@ -336,38 -336,6 +336,38 @@@ config SLUB_STAT
          out which slabs are relevant to a particular load.
          Try running: slabinfo -DA
  
 +config DEBUG_KMEMLEAK
 +      bool "Kernel memory leak detector"
 +      depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM) && \
 +              !MEMORY_HOTPLUG
 +      select DEBUG_SLAB if SLAB
 +      select SLUB_DEBUG if SLUB
 +      select DEBUG_FS if SYSFS
 +      select STACKTRACE if STACKTRACE_SUPPORT
 +      select KALLSYMS
 +      help
 +        Say Y here if you want to enable the memory leak
 +        detector. The memory allocation/freeing is traced in a way
 +        similar to the Boehm's conservative garbage collector, the
 +        difference being that the orphan objects are not freed but
 +        only shown in /sys/kernel/debug/kmemleak. Enabling this
 +        feature will introduce an overhead to memory
 +        allocations. See Documentation/kmemleak.txt for more
 +        details.
 +
 +        In order to access the kmemleak file, debugfs needs to be
 +        mounted (usually at /sys/kernel/debug).
 +
 +config DEBUG_KMEMLEAK_TEST
 +      tristate "Simple test for the kernel memory leak detector"
 +      depends on DEBUG_KMEMLEAK
 +      help
 +        Say Y or M here to build a test for the kernel memory leak
 +        detector. This option enables a module that explicitly leaks
 +        memory.
 +
 +        If unsure, say N.
 +
  config DEBUG_PREEMPT
        bool "Debug preemptible kernel"
        depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)
@@@ -472,7 -440,7 +472,7 @@@ config LOCKDE
        bool
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
        select STACKTRACE
-       select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND && !S390
+       select FRAME_POINTER if !MIPS && !PPC && !ARM_UNWIND && !S390
        select KALLSYMS
        select KALLSYMS_ALL
  
@@@ -996,5 -964,3 +996,5 @@@ config DMA_API_DEBU
  source "samples/Kconfig"
  
  source "lib/Kconfig.kgdb"
 +
 +source "lib/Kconfig.kmemcheck"