diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-10-15 04:19:58 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-19 12:55:13 -0400 |
commit | 36d98e79b798fb27e38b9be4f36c5a96025f9281 (patch) | |
tree | 30f597c63f71b98648d12f817d35c0b375cc72d1 | |
parent | ba38cdf94285a1fc6a01fd493bdc5304bc83f61e (diff) |
[MIPS] A few more pt_regs fixups.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 2 | ||||
-rw-r--r-- | arch/mips/oprofile/op_model_rm9000.c | 3 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-reset.c | 2 | ||||
-rw-r--r-- | arch/mips/sibyte/sb1250/bcm1250_tbprof.c | 4 | ||||
-rw-r--r-- | arch/mips/sibyte/sb1250/bus_watcher.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index c4fae8ff4671..626de44bd888 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -849,7 +849,7 @@ au1xxx_dbdma_chan_free(u32 chanid) | |||
849 | EXPORT_SYMBOL(au1xxx_dbdma_chan_free); | 849 | EXPORT_SYMBOL(au1xxx_dbdma_chan_free); |
850 | 850 | ||
851 | static irqreturn_t | 851 | static irqreturn_t |
852 | dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 852 | dbdma_interrupt(int irq, void *dev_id) |
853 | { | 853 | { |
854 | u32 intstat; | 854 | u32 intstat; |
855 | u32 chan_index; | 855 | u32 chan_index; |
diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c index b7063fefa65b..7dc9bf6f1321 100644 --- a/arch/mips/oprofile/op_model_rm9000.c +++ b/arch/mips/oprofile/op_model_rm9000.c | |||
@@ -80,8 +80,7 @@ static void rm9000_cpu_stop(void *args) | |||
80 | write_c0_perfcontrol(0); | 80 | write_c0_perfcontrol(0); |
81 | } | 81 | } |
82 | 82 | ||
83 | static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id, | 83 | static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id) |
84 | struct pt_regs *regs) | ||
85 | { | 84 | { |
86 | unsigned int control = read_c0_perfcontrol(); | 85 | unsigned int control = read_c0_perfcontrol(); |
87 | uint32_t counter1, counter2; | 86 | uint32_t counter1, counter2; |
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c index fd0932b2d521..db8084411538 100644 --- a/arch/mips/sgi-ip32/ip32-reset.c +++ b/arch/mips/sgi-ip32/ip32-reset.c | |||
@@ -135,7 +135,7 @@ static inline void ip32_power_button(void) | |||
135 | add_timer(&power_timer); | 135 | add_timer(&power_timer); |
136 | } | 136 | } |
137 | 137 | ||
138 | static irqreturn_t ip32_rtc_int(int irq, void *dev_id, struct pt_regs *regs) | 138 | static irqreturn_t ip32_rtc_int(int irq, void *dev_id) |
139 | { | 139 | { |
140 | volatile unsigned char reg_c; | 140 | volatile unsigned char reg_c; |
141 | 141 | ||
diff --git a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c b/arch/mips/sibyte/sb1250/bcm1250_tbprof.c index 992e0d8dbb67..d1a906e683b2 100644 --- a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c +++ b/arch/mips/sibyte/sb1250/bcm1250_tbprof.c | |||
@@ -88,7 +88,7 @@ static void arm_tb(void) | |||
88 | sbp.tb_armed = 1; | 88 | sbp.tb_armed = 1; |
89 | } | 89 | } |
90 | 90 | ||
91 | static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs) | 91 | static irqreturn_t sbprof_tb_intr(int irq, void *dev_id) |
92 | { | 92 | { |
93 | int i; | 93 | int i; |
94 | DBG(printk(DEVNAME ": tb_intr\n")); | 94 | DBG(printk(DEVNAME ": tb_intr\n")); |
@@ -138,7 +138,7 @@ static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
138 | return IRQ_HANDLED; | 138 | return IRQ_HANDLED; |
139 | } | 139 | } |
140 | 140 | ||
141 | static irqreturn_t sbprof_pc_intr(int irq, void *dev_id, struct pt_regs *regs) | 141 | static irqreturn_t sbprof_pc_intr(int irq, void *dev_id) |
142 | { | 142 | { |
143 | printk(DEVNAME ": unexpected pc_intr"); | 143 | printk(DEVNAME ": unexpected pc_intr"); |
144 | return IRQ_NONE; | 144 | return IRQ_NONE; |
diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c index bb90649fbc48..45274bd3cd8b 100644 --- a/arch/mips/sibyte/sb1250/bus_watcher.c +++ b/arch/mips/sibyte/sb1250/bus_watcher.c | |||
@@ -171,7 +171,7 @@ static void create_proc_decoder(struct bw_stats_struct *stats) | |||
171 | * notes: possible re-entry due to multiple sources | 171 | * notes: possible re-entry due to multiple sources |
172 | * should check/indicate saturation | 172 | * should check/indicate saturation |
173 | */ | 173 | */ |
174 | static irqreturn_t sibyte_bw_int(int irq, void *data, struct pt_regs *regs) | 174 | static irqreturn_t sibyte_bw_int(int irq, void *data) |
175 | { | 175 | { |
176 | struct bw_stats_struct *stats = data; | 176 | struct bw_stats_struct *stats = data; |
177 | unsigned long cntr; | 177 | unsigned long cntr; |