diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-21 03:47:15 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:53 -0500 |
commit | 5db141a9469c8446a179696bc7d374f4cd9b207a (patch) | |
tree | e8ef47880573c57d387158b48390dd13c651bfe2 | |
parent | 17bfa6397875e6901c3cafdc711437041664d94c (diff) |
sh: Mark some IRQ debug options sh32 only.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/Kconfig.debug | 4 | ||||
-rw-r--r-- | arch/sh64/kernel/irq.c | 115 |
2 files changed, 2 insertions, 117 deletions
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index f9ce46f1e6ff..89bc174f25c7 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
@@ -62,7 +62,7 @@ config DEBUG_BOOTMEM | |||
62 | 62 | ||
63 | config DEBUG_STACKOVERFLOW | 63 | config DEBUG_STACKOVERFLOW |
64 | bool "Check for stack overflows" | 64 | bool "Check for stack overflows" |
65 | depends on DEBUG_KERNEL | 65 | depends on DEBUG_KERNEL && SUPERH32 |
66 | help | 66 | help |
67 | This option will cause messages to be printed if free stack space | 67 | This option will cause messages to be printed if free stack space |
68 | drops below a certain limit. | 68 | drops below a certain limit. |
@@ -88,7 +88,7 @@ config 4KSTACKS | |||
88 | 88 | ||
89 | config IRQSTACKS | 89 | config IRQSTACKS |
90 | bool "Use separate kernel stacks when processing interrupts" | 90 | bool "Use separate kernel stacks when processing interrupts" |
91 | depends on DEBUG_KERNEL | 91 | depends on DEBUG_KERNEL && SUPERH32 |
92 | help | 92 | help |
93 | If you say Y here the kernel will use separate kernel stacks | 93 | If you say Y here the kernel will use separate kernel stacks |
94 | for handling hard and soft interrupts. This can help avoid | 94 | for handling hard and soft interrupts. This can help avoid |
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c deleted file mode 100644 index 9412b7166700..000000000000 --- a/arch/sh64/kernel/irq.c +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * arch/sh64/kernel/irq.c | ||
7 | * | ||
8 | * Copyright (C) 2000, 2001 Paolo Alberelli | ||
9 | * Copyright (C) 2003 Paul Mundt | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | /* | ||
14 | * IRQs are in fact implemented a bit like signal handlers for the kernel. | ||
15 | * Naturally it's not a 1:1 relation, but there are similarities. | ||
16 | */ | ||
17 | |||
18 | #include <linux/errno.h> | ||
19 | #include <linux/kernel_stat.h> | ||
20 | #include <linux/signal.h> | ||
21 | #include <linux/rwsem.h> | ||
22 | #include <linux/sched.h> | ||
23 | #include <linux/ioport.h> | ||
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/timex.h> | ||
26 | #include <linux/slab.h> | ||
27 | #include <linux/random.h> | ||
28 | #include <linux/smp.h> | ||
29 | #include <linux/init.h> | ||
30 | #include <linux/seq_file.h> | ||
31 | #include <linux/bitops.h> | ||
32 | #include <asm/system.h> | ||
33 | #include <asm/io.h> | ||
34 | #include <asm/smp.h> | ||
35 | #include <asm/pgalloc.h> | ||
36 | #include <asm/delay.h> | ||
37 | #include <asm/irq.h> | ||
38 | #include <linux/irq.h> | ||
39 | |||
40 | void ack_bad_irq(unsigned int irq) | ||
41 | { | ||
42 | printk("unexpected IRQ trap at irq %02x\n", irq); | ||
43 | } | ||
44 | |||
45 | #if defined(CONFIG_PROC_FS) | ||
46 | int show_interrupts(struct seq_file *p, void *v) | ||
47 | { | ||
48 | int i = *(loff_t *) v, j; | ||
49 | struct irqaction * action; | ||
50 | unsigned long flags; | ||
51 | |||
52 | if (i == 0) { | ||
53 | seq_puts(p, " "); | ||
54 | for_each_online_cpu(j) | ||
55 | seq_printf(p, "CPU%d ",j); | ||
56 | seq_putc(p, '\n'); | ||
57 | } | ||
58 | |||
59 | if (i < NR_IRQS) { | ||
60 | spin_lock_irqsave(&irq_desc[i].lock, flags); | ||
61 | action = irq_desc[i].action; | ||
62 | if (!action) | ||
63 | goto unlock; | ||
64 | seq_printf(p, "%3d: ",i); | ||
65 | seq_printf(p, "%10u ", kstat_irqs(i)); | ||
66 | seq_printf(p, " %14s", irq_desc[i].chip->typename); | ||
67 | seq_printf(p, " %s", action->name); | ||
68 | |||
69 | for (action=action->next; action; action = action->next) | ||
70 | seq_printf(p, ", %s", action->name); | ||
71 | seq_putc(p, '\n'); | ||
72 | unlock: | ||
73 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | ||
74 | } | ||
75 | return 0; | ||
76 | } | ||
77 | #endif | ||
78 | |||
79 | /* | ||
80 | * do_NMI handles all Non-Maskable Interrupts. | ||
81 | */ | ||
82 | asmlinkage void do_NMI(unsigned long vector_num, struct pt_regs * regs) | ||
83 | { | ||
84 | if (regs->sr & 0x40000000) | ||
85 | printk("unexpected NMI trap in system mode\n"); | ||
86 | else | ||
87 | printk("unexpected NMI trap in user mode\n"); | ||
88 | |||
89 | /* No statistics */ | ||
90 | } | ||
91 | |||
92 | /* | ||
93 | * do_IRQ handles all normal device IRQ's. | ||
94 | */ | ||
95 | asmlinkage int do_IRQ(unsigned long vector_num, struct pt_regs * regs) | ||
96 | { | ||
97 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
98 | int irq; | ||
99 | |||
100 | irq_enter(); | ||
101 | |||
102 | irq = irq_demux(vector_num); | ||
103 | |||
104 | if (irq >= 0) { | ||
105 | __do_IRQ(irq); | ||
106 | } else { | ||
107 | printk("unexpected IRQ trap at vector %03lx\n", vector_num); | ||
108 | } | ||
109 | |||
110 | irq_exit(); | ||
111 | |||
112 | set_irq_regs(old_regs); | ||
113 | return 1; | ||
114 | } | ||
115 | |||