From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Apr 2010 07:28:45 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9343af084c7e8911897b0883042ee690cee3aaef;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	lib/Kconfig.debug
---

9343af084c7e8911897b0883042ee690cee3aaef
diff --cc arch/sparc/kernel/smp_64.c
index 1011fbf451bb,4c5334528109..b6a2b8f47040
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/profile.h>
  #include <linux/bootmem.h>
  #include <linux/vmalloc.h>
 +#include <linux/ftrace.h>
  #include <linux/cpu.h>
+ #include <linux/slab.h>
  
  #include <asm/head.h>
  #include <asm/ptrace.h>
diff --cc lib/Kconfig.debug
index 6c2be6089559,ff017108700d..935248bdbc47
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -356,7 -356,7 +356,7 @@@ config SLUB_STAT
  config DEBUG_KMEMLEAK
  	bool "Kernel memory leak detector"
  	depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
- 		(X86 || ARM || PPC || S390 || SPARC64 || SUPERH)
 -		(X86 || ARM || PPC || S390 || SUPERH || MICROBLAZE)
++		(X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE)
  
  	select DEBUG_FS if SYSFS
  	select STACKTRACE if STACKTRACE_SUPPORT