diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/syslib/mv64360_pic.c | |
parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/syslib/mv64360_pic.c')
-rw-r--r-- | arch/ppc/syslib/mv64360_pic.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c index 5104386601ed..4b7a3338e122 100644 --- a/arch/ppc/syslib/mv64360_pic.c +++ b/arch/ppc/syslib/mv64360_pic.c | |||
@@ -55,10 +55,9 @@ | |||
55 | 55 | ||
56 | static void mv64360_unmask_irq(unsigned int); | 56 | static void mv64360_unmask_irq(unsigned int); |
57 | static void mv64360_mask_irq(unsigned int); | 57 | static void mv64360_mask_irq(unsigned int); |
58 | static irqreturn_t mv64360_cpu_error_int_handler(int, void *, struct pt_regs *); | 58 | static irqreturn_t mv64360_cpu_error_int_handler(int, void *); |
59 | static irqreturn_t mv64360_sram_error_int_handler(int, void *, | 59 | static irqreturn_t mv64360_sram_error_int_handler(int, void *); |
60 | struct pt_regs *); | 60 | static irqreturn_t mv64360_pci_error_int_handler(int, void *); |
61 | static irqreturn_t mv64360_pci_error_int_handler(int, void *, struct pt_regs *); | ||
62 | 61 | ||
63 | /* ========================== local declarations =========================== */ | 62 | /* ========================== local declarations =========================== */ |
64 | 63 | ||
@@ -131,9 +130,6 @@ mv64360_init_irq(void) | |||
131 | * This function returns the lowest interrupt number of all interrupts that | 130 | * This function returns the lowest interrupt number of all interrupts that |
132 | * are currently asserted. | 131 | * are currently asserted. |
133 | * | 132 | * |
134 | * Input Variable(s): | ||
135 | * struct pt_regs* not used | ||
136 | * | ||
137 | * Output Variable(s): | 133 | * Output Variable(s): |
138 | * None. | 134 | * None. |
139 | * | 135 | * |
@@ -142,7 +138,7 @@ mv64360_init_irq(void) | |||
142 | * | 138 | * |
143 | */ | 139 | */ |
144 | int | 140 | int |
145 | mv64360_get_irq(struct pt_regs *regs) | 141 | mv64360_get_irq(void) |
146 | { | 142 | { |
147 | int irq; | 143 | int irq; |
148 | int irq_gpp; | 144 | int irq_gpp; |
@@ -283,7 +279,7 @@ mv64360_mask_irq(unsigned int irq) | |||
283 | } | 279 | } |
284 | 280 | ||
285 | static irqreturn_t | 281 | static irqreturn_t |
286 | mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) | 282 | mv64360_cpu_error_int_handler(int irq, void *dev_id) |
287 | { | 283 | { |
288 | printk(KERN_ERR "mv64360_cpu_error_int_handler: %s 0x%08x\n", | 284 | printk(KERN_ERR "mv64360_cpu_error_int_handler: %s 0x%08x\n", |
289 | "Error on CPU interface - Cause regiser", | 285 | "Error on CPU interface - Cause regiser", |
@@ -304,7 +300,7 @@ mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) | |||
304 | } | 300 | } |
305 | 301 | ||
306 | static irqreturn_t | 302 | static irqreturn_t |
307 | mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) | 303 | mv64360_sram_error_int_handler(int irq, void *dev_id) |
308 | { | 304 | { |
309 | printk(KERN_ERR "mv64360_sram_error_int_handler: %s 0x%08x\n", | 305 | printk(KERN_ERR "mv64360_sram_error_int_handler: %s 0x%08x\n", |
310 | "Error in internal SRAM - Cause register", | 306 | "Error in internal SRAM - Cause register", |
@@ -325,7 +321,7 @@ mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) | |||
325 | } | 321 | } |
326 | 322 | ||
327 | static irqreturn_t | 323 | static irqreturn_t |
328 | mv64360_pci_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) | 324 | mv64360_pci_error_int_handler(int irq, void *dev_id) |
329 | { | 325 | { |
330 | u32 val; | 326 | u32 val; |
331 | unsigned int pci_bus = (unsigned int)dev_id; | 327 | unsigned int pci_bus = (unsigned int)dev_id; |