Skip to contentSkip to conversation

Rename local move_irq to sn_move_irq

PATCH In review Keith Owens 2 participants 2 messages Jun 30, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Index: linux/arch/ia64/sn/kernel/irq.c
=================================--- linux.orig/arch/ia64/sn/kernel/irq.c Wed Jun 30 13:25:04 2004
+++ linux/arch/ia64/sn/kernel/irq.c Wed Jun 30 13:31:06 2004
@@ -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 */
cpumask_t tmp;
@@ -110,7 +110,7 @@ sn_ack_irq(unsigned int irq)
}
HUB_S((unsigned long *)GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS), mask ); __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
- move_irq(irq);
+ sn_move_irq(irq);
}

static void

#1 lore raw

This code should actually be using the version in irq.c. I think Pat said he'd come up with a patch to do that.

Jesse

Quoted 32 lines · Keith Owens

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.

Index: linux/arch/ia64/sn/kernel/irq.c
=================================> --- linux.orig/arch/ia64/sn/kernel/irq.c Wed Jun 30 13:25:04 2004
+++ linux/arch/ia64/sn/kernel/irq.c Wed Jun 30 13:31:06 2004

(quoted diff) +2 -3
@@ -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 */
 	cpumask_t tmp;
@@ -110,7 +110,7 @@ sn_ack_irq(unsigned int irq)
 	}
 	HUB_S((unsigned long *)GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS),
 mask ); __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
-	move_irq(irq);
+	sn_move_irq(irq);
 }
 
 static void
 
-

To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html