Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask

Conflicts:
	arch/x86/kernel/io_apic.c
	kernel/rcuclassic.c
	kernel/sched.c
	kernel/time/tick-sched.c

Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 26 insertions, 0 deletions

diff --git a/arch/sparc/Kconfig.debug b/arch/sparc/Kconfig.debug
index 87dd496f15eb..b8a15e271bfa 100644
--- a/arch/sparc/Kconfig.debug
+++ b/arch/sparc/Kconfig.debug
@@ -15,4 +15,30 @@ config DEBUG_STACK_USAGE
 
           This option will slow down process creation somewhat.
 
+config DEBUG_DCFLUSH
+        bool "D-cache flush debugging"
+        depends on SPARC64 && DEBUG_KERNEL
+
+config STACK_DEBUG
+        bool "Stack Overflow Detection Support"
+
+config DEBUG_PAGEALLOC
+        bool "Debug page memory allocations"
+        depends on SPARC64 && DEBUG_KERNEL && !HIBERNATION
+        help
+          Unmap pages from the kernel linear mapping after free_pages().
+          This results in a large slowdown, but helps to find certain types
+          of memory corruptions.
+
+config MCOUNT
+        bool
+        depends on SPARC64
+        depends on STACK_DEBUG || FUNCTION_TRACER
+        default y
+
+config FRAME_POINTER
+        bool
+        depends on MCOUNT
+        default y
+
 endmenu