Commit b3e3d3e0 authored by Keith Owens's avatar Keith Owens Committed by David Mosberger

[PATCH] ia64: Rename local move_irq to sn_move_irq

Rename SN local function move_irq to sn_move_irq to remove conflict
with global move_irq.  Needed since ashok.raj moved move_irq() from
iosapic.c to irq.c.
Signed-off-by: default avatarKeith Owens <kaos@sgi.com>
Signed-off-by: default avatarDavid Mosberger <davidm@hpl.hp.com>
parent f9f0080e
...@@ -72,7 +72,7 @@ sn_enable_irq(unsigned int irq) ...@@ -72,7 +72,7 @@ sn_enable_irq(unsigned int irq)
{ {
} }
static inline void move_irq(int irq) static inline void sn_move_irq(int irq)
{ {
/* note - we hold desc->lock */ /* note - we hold desc->lock */
cpumask_t tmp; cpumask_t tmp;
...@@ -110,7 +110,7 @@ sn_ack_irq(unsigned int irq) ...@@ -110,7 +110,7 @@ sn_ack_irq(unsigned int irq)
} }
HUB_S((unsigned long *)GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS), mask ); HUB_S((unsigned long *)GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS), mask );
__set_bit(irq, (volatile void *)pda->sn_in_service_ivecs); __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
move_irq(irq); sn_move_irq(irq);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment