From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 May 2011 23:44:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83d7e948754cf021ed7343b122940fcc27c1bd88;p=mv-sheeva.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
  kmemleak: Initialise kmemleak after debug_objects_mem_init()
  kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK
  kmemleak: Do not return a pointer to an object that kmemleak did not get
---

83d7e948754cf021ed7343b122940fcc27c1bd88
diff --cc lib/Kconfig.debug
index f0aa00ba3fa,4eebb902298..17ac5f87182
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -398,9 -398,9 +398,9 @@@ config SLUB_STAT
  config DEBUG_KMEMLEAK
  	bool "Kernel memory leak detector"
  	depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
 -		(X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
 +		(X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
  
- 	select DEBUG_FS if SYSFS
+ 	select DEBUG_FS
  	select STACKTRACE if STACKTRACE_SUPPORT
  	select KALLSYMS
  	select CRC32