diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 13:46:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 13:46:15 -0400 |
commit | c86defc82c18b648193b5c6aabcc6204fd6bb373 (patch) | |
tree | 1ef70cfa56f5f9a123d0db6fefe4c434c12bd6c6 /kernel/irq/migration.c | |
parent | 1309d7afbed112f0e8e90be9af975550caa0076b (diff) | |
parent | 9ad198cba2a8177eea6a7f2f0202b910abdef96b (diff) |
Merge branch 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (111 commits)
gpio: ab8500: Mark broken
genirq: Remove move_*irq leftovers
genirq: Remove compat code
drivers: Final irq namespace conversion
mn10300: Use generic show_interrupts()
mn10300: Cleanup irq_desc access
mn10300: Convert genirq namespace
frv: Use generic show_interrupts()
frv: Convert genirq namespace
frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
frv: Convert cpu irq_chip to new functions
frv: Convert mb93493 irq_chip to new functions
frv: Convert mb93093 irq_chip to new function
frv: Convert mb93091 irq_chip to new functions
frv: Fix typo from __do_IRQ overhaul
frv: Remove stale irq_chip.end
m68k: Convert irq function namespace
xen: Use new irq_move functions
xen: Cleanup genirq namespace
unicore32: Use generic show_interrupts()
...
Diffstat (limited to 'kernel/irq/migration.c')
-rw-r--r-- | kernel/irq/migration.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index e33d9c8d5089..bc6194698dfd 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
@@ -53,11 +53,6 @@ void irq_move_masked_irq(struct irq_data *idata) | |||
53 | cpumask_clear(desc->pending_mask); | 53 | cpumask_clear(desc->pending_mask); |
54 | } | 54 | } |
55 | 55 | ||
56 | void move_masked_irq(int irq) | ||
57 | { | ||
58 | irq_move_masked_irq(irq_get_irq_data(irq)); | ||
59 | } | ||
60 | |||
61 | void irq_move_irq(struct irq_data *idata) | 56 | void irq_move_irq(struct irq_data *idata) |
62 | { | 57 | { |
63 | bool masked; | 58 | bool masked; |
@@ -80,8 +75,3 @@ void irq_move_irq(struct irq_data *idata) | |||
80 | if (!masked) | 75 | if (!masked) |
81 | idata->chip->irq_unmask(idata); | 76 | idata->chip->irq_unmask(idata); |
82 | } | 77 | } |
83 | |||
84 | void move_native_irq(int irq) | ||
85 | { | ||
86 | irq_move_irq(irq_get_irq_data(irq)); | ||
87 | } | ||