From aae5256e7fce512f27c88e2279802a384c7e67bb Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 8 Jul 2008 15:07:03 -0700
Subject: [PATCH] --- yaml --- r: 104435 b: refs/heads/master c:
 0725cbb97793d4e65bf148e4872959cdbb8c6ddd h: refs/heads/master i:   104433:
 32fd9a118bb9d9cf56a46d609265c67d3c7a2a1b   104431:
 25bce7acab4611e83df3133bea7150beda62da73 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/xen/enlighten.c | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85c3a6bfc84a..e43d8b2b52a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88459d4c7eb68c4a15609e00e5d100e2a305f040
+refs/heads/master: 0725cbb97793d4e65bf148e4872959cdbb8c6ddd
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 8b60982e457a..52f2292672c4 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1085,8 +1085,25 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
 	},
 };
 
+static void __init __xen_init_IRQ(void)
+{
+#ifdef CONFIG_X86_64
+	int i;
+
+	/* Create identity vector->irq map */
+	for(i = 0; i < NR_VECTORS; i++) {
+		int cpu;
+
+		for_each_possible_cpu(cpu)
+			per_cpu(vector_irq, cpu)[i] = i;
+	}
+#endif	/* CONFIG_X86_64 */
+
+	xen_init_IRQ();
+}
+
 static const struct pv_irq_ops xen_irq_ops __initdata = {
-	.init_IRQ = xen_init_IRQ,
+	.init_IRQ = __xen_init_IRQ,
 	.save_fl = xen_save_fl,
 	.restore_fl = xen_restore_fl,
 	.irq_disable = xen_irq_disable,