aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-10-06 02:31:16 -0400
committerPaul Mundt <lethal@linux-sh.org>2006-10-06 02:31:16 -0400
commit35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 (patch)
treed3057d468d36664d1accf964e76f6d97a299b40d /arch/sh
parenta700f3594d63a85af196ac64984f7375d903afad (diff)
sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/hp6xx/hp6xx_apm.c4
-rw-r--r--arch/sh/boards/landisk/landisk_pwb.c2
-rw-r--r--arch/sh/boards/mpc1211/setup.c5
-rw-r--r--arch/sh/boards/snapgear/setup.c2
-rw-r--r--arch/sh/cchips/hd6446x/hd64461/setup.c2
-rw-r--r--arch/sh/cchips/hd6446x/hd64465/gpio.c2
-rw-r--r--arch/sh/cchips/hd6446x/hd64465/setup.c2
-rw-r--r--arch/sh/cchips/voyagergx/irq.c3
-rw-r--r--arch/sh/drivers/dma/dma-g2.c2
-rw-r--r--arch/sh/drivers/dma/dma-pvr2.c2
-rw-r--r--arch/sh/drivers/dma/dma-sh.c6
-rw-r--r--arch/sh/drivers/pci/pci-st40.c2
-rw-r--r--arch/sh/kernel/irq.c19
-rw-r--r--arch/sh/kernel/time.c7
-rw-r--r--arch/sh/kernel/timers/timer-tmu.c5
15 files changed, 35 insertions, 30 deletions
diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c
index 75f91aaae077..219179114f0f 100644
--- a/arch/sh/boards/hp6xx/hp6xx_apm.c
+++ b/arch/sh/boards/hp6xx/hp6xx_apm.c
@@ -83,7 +83,7 @@ static int hp6x0_apm_get_info(char *buf, char **start, off_t fpos, int length)
83 return p - buf; 83 return p - buf;
84} 84}
85 85
86static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev, struct pt_regs *regs) 86static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev)
87{ 87{
88 if (!apm_suspended) 88 if (!apm_suspended)
89 apm_queue_event(APM_USER_SUSPEND); 89 apm_queue_event(APM_USER_SUSPEND);
@@ -96,7 +96,7 @@ static int __init hp6x0_apm_init(void)
96 int ret; 96 int ret;
97 97
98 ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt, 98 ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,
99 SA_INTERRUPT, MODNAME, 0); 99 IRQF_DISABLED, MODNAME, 0);
100 if (unlikely(ret < 0)) { 100 if (unlikely(ret < 0)) {
101 printk(KERN_ERR MODNAME ": IRQ %d request failed\n", 101 printk(KERN_ERR MODNAME ": IRQ %d request failed\n",
102 HP680_BTN_IRQ); 102 HP680_BTN_IRQ);
diff --git a/arch/sh/boards/landisk/landisk_pwb.c b/arch/sh/boards/landisk/landisk_pwb.c
index 0b7bee1a9ca5..e62524978160 100644
--- a/arch/sh/boards/landisk/landisk_pwb.c
+++ b/arch/sh/boards/landisk/landisk_pwb.c
@@ -135,7 +135,7 @@ static int swdrv_write(struct file *filp, const char *buff, size_t count,
135 return count; 135 return count;
136} 136}
137 137
138static irqreturn_t sw_interrupt(int irq, void *dev_id, struct pt_regs *regs) 138static irqreturn_t sw_interrupt(int irq, void *dev_id)
139{ 139{
140 landisk_btn = (0x0ff & (~ctrl_inb(PA_STATUS))); 140 landisk_btn = (0x0ff & (~ctrl_inb(PA_STATUS)));
141 disable_irq(IRQ_BUTTON); 141 disable_irq(IRQ_BUTTON);
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c
index 01c10fa5c058..7c3d1d304157 100644
--- a/arch/sh/boards/mpc1211/setup.c
+++ b/arch/sh/boards/mpc1211/setup.c
@@ -69,7 +69,6 @@ static void __init pci_write_config(unsigned long busNo,
69 69
70static unsigned char m_irq_mask = 0xfb; 70static unsigned char m_irq_mask = 0xfb;
71static unsigned char s_irq_mask = 0xff; 71static unsigned char s_irq_mask = 0xff;
72volatile unsigned long irq_err_count;
73 72
74static void disable_mpc1211_irq(unsigned int irq) 73static void disable_mpc1211_irq(unsigned int irq)
75{ 74{
@@ -118,7 +117,7 @@ static void mask_and_ack_mpc1211(unsigned int irq)
118 if(irq < 8) { 117 if(irq < 8) {
119 if(m_irq_mask & (1<<irq)){ 118 if(m_irq_mask & (1<<irq)){
120 if(!mpc1211_irq_real(irq)){ 119 if(!mpc1211_irq_real(irq)){
121 irq_err_count++; 120 atomic_inc(&irq_err_count)
122 printk("spurious 8259A interrupt: IRQ %x\n",irq); 121 printk("spurious 8259A interrupt: IRQ %x\n",irq);
123 } 122 }
124 } else { 123 } else {
@@ -131,7 +130,7 @@ static void mask_and_ack_mpc1211(unsigned int irq)
131 } else { 130 } else {
132 if(s_irq_mask & (1<<(irq - 8))){ 131 if(s_irq_mask & (1<<(irq - 8))){
133 if(!mpc1211_irq_real(irq)){ 132 if(!mpc1211_irq_real(irq)){
134 irq_err_count++; 133 atomic_inc(&irq_err_count);
135 printk("spurious 8259A interrupt: IRQ %x\n",irq); 134 printk("spurious 8259A interrupt: IRQ %x\n",irq);
136 } 135 }
137 } else { 136 } else {
diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/snapgear/setup.c
index f5e98c56b530..540d0bf16446 100644
--- a/arch/sh/boards/snapgear/setup.c
+++ b/arch/sh/boards/snapgear/setup.c
@@ -33,7 +33,7 @@ extern void pcibios_init(void);
33 * EraseConfig handling functions 33 * EraseConfig handling functions
34 */ 34 */
35 35
36static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id, struct pt_regs *regs) 36static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id)
37{ 37{
38 volatile char dummy __attribute__((unused)) = * (volatile char *) 0xb8000000; 38 volatile char dummy __attribute__((unused)) = * (volatile char *) 0xb8000000;
39 39
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index 38f1e8171a3a..4d49b5cbcc13 100644
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -71,7 +71,7 @@ static struct hw_interrupt_type hd64461_irq_type = {
71 .end = end_hd64461_irq, 71 .end = end_hd64461_irq,
72}; 72};
73 73
74static irqreturn_t hd64461_interrupt(int irq, void *dev_id, struct pt_regs *regs) 74static irqreturn_t hd64461_interrupt(int irq, void *dev_id)
75{ 75{
76 printk(KERN_INFO 76 printk(KERN_INFO
77 "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", 77 "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n",
diff --git a/arch/sh/cchips/hd6446x/hd64465/gpio.c b/arch/sh/cchips/hd6446x/hd64465/gpio.c
index 72320d02d69a..43431855ec86 100644
--- a/arch/sh/cchips/hd6446x/hd64465/gpio.c
+++ b/arch/sh/cchips/hd6446x/hd64465/gpio.c
@@ -85,7 +85,7 @@ static struct {
85 void *dev; 85 void *dev;
86} handlers[GPIO_NPORTS * 8]; 86} handlers[GPIO_NPORTS * 8];
87 87
88static irqreturn_t hd64465_gpio_interrupt(int irq, void *dev, struct pt_regs *regs) 88static irqreturn_t hd64465_gpio_interrupt(int irq, void *dev)
89{ 89{
90 unsigned short port, pin, isr, mask, portpin; 90 unsigned short port, pin, isr, mask, portpin;
91 91
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c
index 30573d3e1966..d126e1f30dee 100644
--- a/arch/sh/cchips/hd6446x/hd64465/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64465/setup.c
@@ -84,7 +84,7 @@ static struct hw_interrupt_type hd64465_irq_type = {
84}; 84};
85 85
86 86
87static irqreturn_t hd64465_interrupt(int irq, void *dev_id, struct pt_regs *regs) 87static irqreturn_t hd64465_interrupt(int irq, void *dev_id)
88{ 88{
89 printk(KERN_INFO 89 printk(KERN_INFO
90 "HD64465: spurious interrupt, nirr: 0x%x nimr: 0x%x\n", 90 "HD64465: spurious interrupt, nirr: 0x%x nimr: 0x%x\n",
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 392c8b12ce36..bf1b28feca06 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -88,8 +88,7 @@ static struct hw_interrupt_type voyagergx_irq_type = {
88 .end = end_voyagergx_irq, 88 .end = end_voyagergx_irq,
89}; 89};
90 90
91static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, 91static irqreturn_t voyagergx_interrupt(int irq, void *dev_id)
92 struct pt_regs *regs)
93{ 92{
94 printk(KERN_INFO 93 printk(KERN_INFO
95 "VoyagerGX: spurious interrupt, status: 0x%x\n", 94 "VoyagerGX: spurious interrupt, status: 0x%x\n",
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c
index 9cb070924180..0caf11bb7e27 100644
--- a/arch/sh/drivers/dma/dma-g2.c
+++ b/arch/sh/drivers/dma/dma-g2.c
@@ -51,7 +51,7 @@ static volatile struct g2_dma_info *g2_dma = (volatile struct g2_dma_info *)0xa0
51 ((g2_dma->channel[i].size - \ 51 ((g2_dma->channel[i].size - \
52 g2_dma->status[i].size) & 0x0fffffff) 52 g2_dma->status[i].size) & 0x0fffffff)
53 53
54static irqreturn_t g2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) 54static irqreturn_t g2_dma_interrupt(int irq, void *dev_id)
55{ 55{
56 int i; 56 int i;
57 57
diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c
index c1b6bc23c107..838fad566eaf 100644
--- a/arch/sh/drivers/dma/dma-pvr2.c
+++ b/arch/sh/drivers/dma/dma-pvr2.c
@@ -21,7 +21,7 @@
21static unsigned int xfer_complete; 21static unsigned int xfer_complete;
22static int count; 22static int count;
23 23
24static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) 24static irqreturn_t pvr2_dma_interrupt(int irq, void *dev_id)
25{ 25{
26 if (get_dma_residue(PVR2_CASCADE_CHAN)) { 26 if (get_dma_residue(PVR2_CASCADE_CHAN)) {
27 printk(KERN_WARNING "DMA: SH DMAC did not complete transfer " 27 printk(KERN_WARNING "DMA: SH DMAC did not complete transfer "
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index cbbe8bce3d67..d8ece20bb2cf 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -60,9 +60,9 @@ static inline unsigned int calc_xmit_shift(struct dma_channel *chan)
60 * Besides that it needs to waken any waiting process, which should handle 60 * Besides that it needs to waken any waiting process, which should handle
61 * setting up the next transfer. 61 * setting up the next transfer.
62 */ 62 */
63static irqreturn_t dma_tei(int irq, void *dev_id, struct pt_regs *regs) 63static irqreturn_t dma_tei(int irq, void *dev_id)
64{ 64{
65 struct dma_channel *chan = (struct dma_channel *)dev_id; 65 struct dma_channel *chan = dev_id;
66 u32 chcr; 66 u32 chcr;
67 67
68 chcr = ctrl_inl(CHCR[chan->chan]); 68 chcr = ctrl_inl(CHCR[chan->chan]);
@@ -228,7 +228,7 @@ static inline int dmaor_reset(void)
228} 228}
229 229
230#if defined(CONFIG_CPU_SH4) 230#if defined(CONFIG_CPU_SH4)
231static irqreturn_t dma_err(int irq, void *dev_id, struct pt_regs *regs) 231static irqreturn_t dma_err(int irq, void *dummy)
232{ 232{
233 dmaor_reset(); 233 dmaor_reset();
234 disable_irq(irq); 234 disable_irq(irq);
diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c
index 4ab5ea6b35fb..efecb3d5995c 100644
--- a/arch/sh/drivers/pci/pci-st40.c
+++ b/arch/sh/drivers/pci/pci-st40.c
@@ -161,7 +161,7 @@ static char * pci_commands[16]={
161 "Memory Write-and-Invalidate" 161 "Memory Write-and-Invalidate"
162}; 162};
163 163
164static irqreturn_t st40_pci_irq(int irq, void *dev_instance, struct pt_regs *regs) 164static irqreturn_t st40_pci_irq(int irq, void *dev_instance)
165{ 165{
166 unsigned pci_int, pci_air, pci_cir, pci_aint; 166 unsigned pci_int, pci_air, pci_cir, pci_aint;
167 static int count=0; 167 static int count=0;
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index c7ebd6aec951..3b93682bf18b 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -17,6 +17,8 @@
17#include <asm/thread_info.h> 17#include <asm/thread_info.h>
18#include <asm/cpu/mmu_context.h> 18#include <asm/cpu/mmu_context.h>
19 19
20atomic_t irq_err_count;
21
20/* 22/*
21 * 'what should we do if we get a hw irq event on an illegal vector'. 23 * 'what should we do if we get a hw irq event on an illegal vector'.
22 * each architecture has to answer this themselves, it doesn't deserve 24 * each architecture has to answer this themselves, it doesn't deserve
@@ -47,8 +49,10 @@ int show_interrupts(struct seq_file *p, void *v)
47 if (!action) 49 if (!action)
48 goto unlock; 50 goto unlock;
49 seq_printf(p, "%3d: ",i); 51 seq_printf(p, "%3d: ",i);
50 seq_printf(p, "%10u ", kstat_irqs(i)); 52 for_each_online_cpu(j)
51 seq_printf(p, " %14s", irq_desc[i].chip->typename); 53 seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
54 seq_printf(p, " %14s", irq_desc[i].chip->name);
55 seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq));
52 seq_printf(p, " %s", action->name); 56 seq_printf(p, " %s", action->name);
53 57
54 for (action=action->next; action; action = action->next) 58 for (action=action->next; action; action = action->next)
@@ -56,7 +60,9 @@ int show_interrupts(struct seq_file *p, void *v)
56 seq_putc(p, '\n'); 60 seq_putc(p, '\n');
57unlock: 61unlock:
58 spin_unlock_irqrestore(&irq_desc[i].lock, flags); 62 spin_unlock_irqrestore(&irq_desc[i].lock, flags);
59 } 63 } else if (i == NR_IRQS)
64 seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count));
65
60 return 0; 66 return 0;
61} 67}
62#endif 68#endif
@@ -78,6 +84,7 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
78 unsigned long r6, unsigned long r7, 84 unsigned long r6, unsigned long r7,
79 struct pt_regs regs) 85 struct pt_regs regs)
80{ 86{
87 struct pt_regs *old_regs = set_irq_regs(&regs);
81 int irq = r4; 88 int irq = r4;
82#ifdef CONFIG_4KSTACKS 89#ifdef CONFIG_4KSTACKS
83 union irq_ctx *curctx, *irqctx; 90 union irq_ctx *curctx, *irqctx;
@@ -139,7 +146,6 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
139 146
140 __asm__ __volatile__ ( 147 __asm__ __volatile__ (
141 "mov %0, r4 \n" 148 "mov %0, r4 \n"
142 "mov %1, r5 \n"
143 "mov r15, r9 \n" 149 "mov r15, r9 \n"
144 "jsr @%2 \n" 150 "jsr @%2 \n"
145 /* swith to the irq stack */ 151 /* swith to the irq stack */
@@ -147,17 +153,18 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
147 /* restore the stack (ring zero) */ 153 /* restore the stack (ring zero) */
148 "mov r9, r15 \n" 154 "mov r9, r15 \n"
149 : /* no outputs */ 155 : /* no outputs */
150 : "r" (irq), "r" (&regs), "r" (__do_IRQ), "r" (isp) 156 : "r" (irq), "r" (generic_handle_irq), "r" (isp)
151 /* XXX: A somewhat excessive clobber list? -PFM */ 157 /* XXX: A somewhat excessive clobber list? -PFM */
152 : "memory", "r0", "r1", "r2", "r3", "r4", 158 : "memory", "r0", "r1", "r2", "r3", "r4",
153 "r5", "r6", "r7", "r8", "t", "pr" 159 "r5", "r6", "r7", "r8", "t", "pr"
154 ); 160 );
155 } else 161 } else
156#endif 162#endif
157 __do_IRQ(irq, &regs); 163 generic_handle_irq(irq);
158 164
159 irq_exit(); 165 irq_exit();
160 166
167 set_irq_regs(old_regs);
161 return 1; 168 return 1;
162} 169}
163 170
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 1fbb83c665dd..57e708d7b52d 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -109,13 +109,14 @@ static long last_rtc_update;
109 * handle_timer_tick() needs to keep up the real-time clock, 109 * handle_timer_tick() needs to keep up the real-time clock,
110 * as well as call the "do_timer()" routine every clocktick 110 * as well as call the "do_timer()" routine every clocktick
111 */ 111 */
112void handle_timer_tick(struct pt_regs *regs) 112void handle_timer_tick(void)
113{ 113{
114 do_timer(1); 114 do_timer(1);
115#ifndef CONFIG_SMP 115#ifndef CONFIG_SMP
116 update_process_times(user_mode(regs)); 116 update_process_times(user_mode(get_irq_regs()));
117#endif 117#endif
118 profile_tick(CPU_PROFILING, regs); 118 if (current->pid)
119 profile_tick(CPU_PROFILING);
119 120
120#ifdef CONFIG_HEARTBEAT 121#ifdef CONFIG_HEARTBEAT
121 if (sh_mv.mv_heartbeat != NULL) 122 if (sh_mv.mv_heartbeat != NULL)
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index badfedb455a9..24927015dc31 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -80,8 +80,7 @@ static unsigned long tmu_timer_get_offset(void)
80 return count; 80 return count;
81} 81}
82 82
83static irqreturn_t tmu_timer_interrupt(int irq, void *dev_id, 83static irqreturn_t tmu_timer_interrupt(int irq, void *dummy)
84 struct pt_regs *regs)
85{ 84{
86 unsigned long timer_status; 85 unsigned long timer_status;
87 86
@@ -98,7 +97,7 @@ static irqreturn_t tmu_timer_interrupt(int irq, void *dev_id,
98 * locally disabled. -arca 97 * locally disabled. -arca
99 */ 98 */
100 write_seqlock(&xtime_lock); 99 write_seqlock(&xtime_lock);
101 handle_timer_tick(regs); 100 handle_timer_tick();
102 write_sequnlock(&xtime_lock); 101 write_sequnlock(&xtime_lock);
103 102
104 return IRQ_HANDLED; 103 return IRQ_HANDLED;