From 32dc5e4284ae5e35b4fd41640801f2b25dd8edcd Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 11 Jul 2009 20:05:34 +0900
Subject: [PATCH] --- yaml --- r: 163328 b: refs/heads/master c:
 9f14b84afda297d301b81a5bcbd65e83d7b02034 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/sh/Kconfig.debug | 17 ++++-------------
 trunk/arch/sh/kernel/irq.c  | 17 -----------------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 123d05a20189..ebbe99f304d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 473d1cf4ee623b043790838bcf77e77958840bf2
+refs/heads/master: 9f14b84afda297d301b81a5bcbd65e83d7b02034
diff --git a/trunk/arch/sh/Kconfig.debug b/trunk/arch/sh/Kconfig.debug
index 75b5f4e06670..b440fd936714 100644
--- a/trunk/arch/sh/Kconfig.debug
+++ b/trunk/arch/sh/Kconfig.debug
@@ -61,12 +61,14 @@ config EARLY_PRINTK
 	  select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
 	  the kernel command line option to toggle back and forth.
 
-config DEBUG_STACKOVERFLOW
+config STACK_DEBUG
 	bool "Check for stack overflows"
 	depends on DEBUG_KERNEL && SUPERH32
 	help
 	  This option will cause messages to be printed if free stack space
-	  drops below a certain limit.
+	  drops below a certain limit. Saying Y here will add overhead to
+	  every function call and will therefore incur a major
+	  performance hit. Most users should say N.
 
 config DEBUG_STACK_USAGE
 	bool "Stack utilization instrumentation"
@@ -123,17 +125,6 @@ config SH64_SR_WATCH
 	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
 	depends on SUPERH64
 
-config STACK_DEBUG
-	bool "Enable diagnostic checks of the kernel stack"
-	depends on FUNCTION_TRACER
-	select DEBUG_STACKOVERFLOW
-	default n
-	help
-	  This option allows checks to be performed on the kernel stack
-	  at runtime. Saying Y here will add overhead to every function
-	  call and will therefore incur a major performance hit. Most
-	  users should say N.
-
 config MCOUNT
 	def_bool y
 	depends on SUPERH32
diff --git a/trunk/arch/sh/kernel/irq.c b/trunk/arch/sh/kernel/irq.c
index 3d09062f4682..278c68c60488 100644
--- a/trunk/arch/sh/kernel/irq.c
+++ b/trunk/arch/sh/kernel/irq.c
@@ -114,23 +114,6 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
 #endif
 
 	irq_enter();
-
-#ifdef CONFIG_DEBUG_STACKOVERFLOW
-	/* Debugging check for stack overflow: is there less than 1KB free? */
-	{
-		long sp;
-
-		__asm__ __volatile__ ("and r15, %0" :
-					"=r" (sp) : "0" (THREAD_SIZE - 1));
-
-		if (unlikely(sp < (sizeof(struct thread_info) + STACK_WARN))) {
-			printk("do_IRQ: stack overflow: %ld\n",
-			       sp - sizeof(struct thread_info));
-			dump_stack();
-		}
-	}
-#endif
-
 	irq = irq_demux(intc_evt2irq(irq));
 
 #ifdef CONFIG_IRQSTACKS