diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-12 11:45:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-12 11:45:25 -0400 |
| commit | 3e28ad7b2442e02c35c2fee2d85a90d0202a9aad (patch) | |
| tree | e862c99ab02b7d899c99b9b6b736fbbb63ec1e73 /arch/sh/kernel | |
| parent | 040f43e0bf70935cbe8a775110206d11367e11db (diff) | |
| parent | e460ab27b6c3ea313762169713086529d5bfb8bc (diff) | |
Merge branches 'sh/compressors' and 'sh/ftrace'
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/irq.c | 17 | ||||
| -rw-r--r-- | arch/sh/kernel/sh_ksyms_32.c | 4 |
2 files changed, 2 insertions, 19 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 3d09062f468..278c68c6048 100644 --- a/arch/sh/kernel/irq.c +++ b/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 diff --git a/arch/sh/kernel/sh_ksyms_32.c b/arch/sh/kernel/sh_ksyms_32.c index fcc5de31f83..cec610888e2 100644 --- a/arch/sh/kernel/sh_ksyms_32.c +++ b/arch/sh/kernel/sh_ksyms_32.c @@ -106,8 +106,8 @@ EXPORT_SYMBOL(flush_dcache_page); EXPORT_SYMBOL(clear_user_page); #endif -#ifdef CONFIG_FUNCTION_TRACER -EXPORT_SYMBOL(mcount); +#ifdef CONFIG_MCOUNT +DECLARE_EXPORT(mcount); #endif EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial_copy_generic); |