From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 18 May 2006 09:46:07 +0000 (+0100)
Subject: Rename init_IRQ to xen_init_IRQ, so that non-x86 can use their own init_IRQ.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16047^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=611cde25ae9f5a7806c2615310b20dd35aed18a2;p=xen.git

Rename init_IRQ to xen_init_IRQ, so that non-x86 can use their own init_IRQ.
Signed-off-by Kevin Tian <Kevin.tian@intel.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
index d51a986108..15fe014f33 100644
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
@@ -41,10 +41,10 @@
 #include <asm/system.h>
 #include <asm/ptrace.h>
 #include <asm/synch_bitops.h>
+#include <xen/evtchn.h>
 #include <xen/interface/event_channel.h>
 #include <xen/interface/physdev.h>
 #include <asm/hypervisor.h>
-#include <xen/evtchn.h>
 #include <linux/mc146818rtc.h> /* RTC_IRQ */
 
 /*
@@ -163,6 +163,12 @@ static inline unsigned int cpu_from_evtchn(unsigned int evtchn)
 /* Upcall to generic IRQ layer. */
 #ifdef CONFIG_X86
 extern fastcall unsigned int do_IRQ(struct pt_regs *regs);
+void __init xen_init_IRQ(void);
+void __init init_IRQ(void)
+{
+	irq_ctx_init(0);
+	xen_init_IRQ();
+}
 #if defined (__i386__)
 static inline void exit_idle(void) {}
 #define IRQ_REG orig_eax
@@ -804,13 +810,11 @@ void irq_resume(void)
 	}
 }
 
-void __init init_IRQ(void)
+void __init xen_init_IRQ(void)
 {
 	int i;
 	int cpu;
 
-	irq_ctx_init(0);
-
 	spin_lock_init(&irq_mapping_update_lock);
 
 	init_evtchn_cpu_bindings();