From 3fb1f548f96a796ce4b5b0c038ed32beb9e00b64 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 20:35:17 +0100 Subject: [PATCH] --- yaml --- r: 243315 b: refs/heads/master c: b5f0149626ebca4e5f8dd465d335d1b05f28608b h: refs/heads/master i: 243313: 3efc8da29e519b5125135e512a6b47937aabb55e 243311: d01e96fc1e85fd3f9617c43bf014b8bfa7596283 v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/irq.c | 2 +- trunk/arch/ia64/sn/kernel/msi_sn.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b52984d8ff61..ede8529c8a1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91ce72e08047190291777ec56598118225910203 +refs/heads/master: b5f0149626ebca4e5f8dd465d335d1b05f28608b diff --git a/trunk/arch/ia64/sn/kernel/irq.c b/trunk/arch/ia64/sn/kernel/irq.c index b2aa79391724..69578cf8f177 100644 --- a/trunk/arch/ia64/sn/kernel/irq.c +++ b/trunk/arch/ia64/sn/kernel/irq.c @@ -109,7 +109,7 @@ static void sn_ack_irq(struct irq_data *data) HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS), mask); __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs); - move_native_irq(irq); + irq_move_irq(data); } static void sn_irq_info_free(struct rcu_head *head); diff --git a/trunk/arch/ia64/sn/kernel/msi_sn.c b/trunk/arch/ia64/sn/kernel/msi_sn.c index 323471114352..bedb9dd2e31a 100644 --- a/trunk/arch/ia64/sn/kernel/msi_sn.c +++ b/trunk/arch/ia64/sn/kernel/msi_sn.c @@ -214,7 +214,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, static void sn_ack_msi_irq(struct irq_data *data) { - move_native_irq(data->irq); + irq_move_irq(data); ia64_eoi(); }