diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 15:35:17 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 08:48:04 -0400 |
commit | b5f0149626ebca4e5f8dd465d335d1b05f28608b (patch) | |
tree | 51a70c0d3c3290706cf1e856bcc6e4f6e20e6ccd /arch/ia64 | |
parent | 91ce72e08047190291777ec56598118225910203 (diff) |
ia64: sn: Use irq_move_irq()
This replaces the old move_native_irq() function which is going away.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/msi_sn.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index b2aa79391724..69578cf8f177 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -109,7 +109,7 @@ static void sn_ack_irq(struct irq_data *data) | |||
109 | HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS), mask); | 109 | HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS), mask); |
110 | __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs); | 110 | __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs); |
111 | 111 | ||
112 | move_native_irq(irq); | 112 | irq_move_irq(data); |
113 | } | 113 | } |
114 | 114 | ||
115 | static void sn_irq_info_free(struct rcu_head *head); | 115 | static void sn_irq_info_free(struct rcu_head *head); |
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c index 323471114352..bedb9dd2e31a 100644 --- a/arch/ia64/sn/kernel/msi_sn.c +++ b/arch/ia64/sn/kernel/msi_sn.c | |||
@@ -214,7 +214,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, | |||
214 | 214 | ||
215 | static void sn_ack_msi_irq(struct irq_data *data) | 215 | static void sn_ack_msi_irq(struct irq_data *data) |
216 | { | 216 | { |
217 | move_native_irq(data->irq); | 217 | irq_move_irq(data); |
218 | ia64_eoi(); | 218 | ia64_eoi(); |
219 | } | 219 | } |
220 | 220 | ||