summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 08:48:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 08:48:39 -0700
commitaddb2d6c13993060ae75f5005815b19dd2abdd64 (patch)
treee1123e60154475217e70d5ea04636ddac812da66 /lib
parent84db18bbeb5c9c1a9c86e38a89d76ee526fd2c6f (diff)
parentaf2b021fd6dc3e145d20f5eb927af9590c80bc44 (diff)
downloadop-kernel-dev-addb2d6c13993060ae75f5005815b19dd2abdd64.zip
op-kernel-dev-addb2d6c13993060ae75f5005815b19dd2abdd64.tar.gz
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Remove unused variable from ptrace microblaze: io.h: Add io big-endian function microblaze: Enable memory leak detector microblaze: Fix futex code microblaze: Fix ftrace_update_ftrace_func panic
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1fafb4b..ff01710 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -356,7 +356,7 @@ config SLUB_STATS
config DEBUG_KMEMLEAK
bool "Kernel memory leak detector"
depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
- (X86 || ARM || PPC || S390 || SUPERH)
+ (X86 || ARM || PPC || S390 || SUPERH || MICROBLAZE)
select DEBUG_FS if SYSFS
select STACKTRACE if STACKTRACE_SUPPORT
OpenPOWER on IntegriCloud