diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-07-01 14:39:19 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 16:35:48 -0500 |
commit | 1425df87c25b15400c9f26d57821bcfe01286b2a (patch) | |
tree | 845f69013de5ebb1b9ebfe4746c096664a505567 /arch/m68k/kernel | |
parent | edb347256c44366888debb4f9e8477ac700a9026 (diff) |
m68k/irq: Rename {,__}m68k_handle_int()
- Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded
asmlinkage,
- Rename __m68k_handle_int() to do_IRQ().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/entry_mm.S | 4 | ||||
-rw-r--r-- | arch/m68k/kernel/ints.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S index bd0ec05263b2..f5927d0927b4 100644 --- a/arch/m68k/kernel/entry_mm.S +++ b/arch/m68k/kernel/entry_mm.S | |||
@@ -207,7 +207,7 @@ ENTRY(auto_inthandler) | |||
207 | movel %sp,%sp@- | 207 | movel %sp,%sp@- |
208 | movel %d0,%sp@- | put vector # on stack | 208 | movel %d0,%sp@- | put vector # on stack |
209 | auto_irqhandler_fixup = . + 2 | 209 | auto_irqhandler_fixup = . + 2 |
210 | jsr __m68k_handle_int | process the IRQ | 210 | jsr do_IRQ | process the IRQ |
211 | addql #8,%sp | pop parameters off stack | 211 | addql #8,%sp | pop parameters off stack |
212 | 212 | ||
213 | ret_from_interrupt: | 213 | ret_from_interrupt: |
@@ -241,7 +241,7 @@ user_irqvec_fixup = . + 2 | |||
241 | movel %sp,%sp@- | 241 | movel %sp,%sp@- |
242 | movel %d0,%sp@- | put vector # on stack | 242 | movel %d0,%sp@- | put vector # on stack |
243 | user_irqhandler_fixup = . + 2 | 243 | user_irqhandler_fixup = . + 2 |
244 | jsr __m68k_handle_int | process the IRQ | 244 | jsr do_IRQ | process the IRQ |
245 | addql #8,%sp | pop parameters off stack | 245 | addql #8,%sp | pop parameters off stack |
246 | 246 | ||
247 | subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) | 247 | subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) |
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 4f9868e160bd..15dbbe297334 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
@@ -110,7 +110,7 @@ void __init init_IRQ(void) | |||
110 | * @handler: called from auto vector interrupts | 110 | * @handler: called from auto vector interrupts |
111 | * | 111 | * |
112 | * setup the handler to be called from auto vector interrupts instead of the | 112 | * setup the handler to be called from auto vector interrupts instead of the |
113 | * standard __m68k_handle_int(), it will be called with irq numbers in the range | 113 | * standard do_IRQ(), it will be called with irq numbers in the range |
114 | * from IRQ_AUTO_1 - IRQ_AUTO_7. | 114 | * from IRQ_AUTO_1 - IRQ_AUTO_7. |
115 | */ | 115 | */ |
116 | void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)) | 116 | void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)) |
@@ -129,7 +129,7 @@ void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_re | |||
129 | * setup user vector interrupts, this includes activating the specified range | 129 | * setup user vector interrupts, this includes activating the specified range |
130 | * of interrupts, only then these interrupts can be requested (note: this is | 130 | * of interrupts, only then these interrupts can be requested (note: this is |
131 | * different from auto vector interrupts). An optional handler can be installed | 131 | * different from auto vector interrupts). An optional handler can be installed |
132 | * to be called instead of the default __m68k_handle_int(), it will be called | 132 | * to be called instead of the default do_IRQ(), it will be called |
133 | * with irq numbers starting from IRQ_USER. | 133 | * with irq numbers starting from IRQ_USER. |
134 | */ | 134 | */ |
135 | void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, | 135 | void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, |
@@ -398,7 +398,7 @@ unsigned int irq_canonicalize(unsigned int irq) | |||
398 | 398 | ||
399 | EXPORT_SYMBOL(irq_canonicalize); | 399 | EXPORT_SYMBOL(irq_canonicalize); |
400 | 400 | ||
401 | asmlinkage void m68k_handle_int(unsigned int irq) | 401 | void generic_handle_irq(unsigned int irq) |
402 | { | 402 | { |
403 | struct irq_data *node; | 403 | struct irq_data *node; |
404 | kstat_cpu(0).irqs[irq]++; | 404 | kstat_cpu(0).irqs[irq]++; |
@@ -409,11 +409,11 @@ asmlinkage void m68k_handle_int(unsigned int irq) | |||
409 | } while (node); | 409 | } while (node); |
410 | } | 410 | } |
411 | 411 | ||
412 | asmlinkage void __m68k_handle_int(unsigned int irq, struct pt_regs *regs) | 412 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs) |
413 | { | 413 | { |
414 | struct pt_regs *old_regs; | 414 | struct pt_regs *old_regs; |
415 | old_regs = set_irq_regs(regs); | 415 | old_regs = set_irq_regs(regs); |
416 | m68k_handle_int(irq); | 416 | generic_handle_irq(irq); |
417 | set_irq_regs(old_regs); | 417 | set_irq_regs(old_regs); |
418 | } | 418 | } |
419 | 419 | ||