---

yaml --- r: 305013 b: refs/heads/master c: ab6ec39 h: refs/heads/master i: 305011: 2cf171a v: v3
git-mirror · May 1, 2012 · b5094f8 · b5094f8
1 parent 639ef89
commit b5094f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27abd14bd9f1117dc7bdeee81a2de0557e077b61
+refs/heads/master: ab6ec39a191243b9968bb9ac7f26cc7ec30c618b
diff --git a/trunk/arch/x86/xen/apic.c b/trunk/arch/x86/xen/apic.c
@@ -1,8 +1,21 @@
 #include <linux/init.h>
 #include <asm/x86_init.h>
+#include <asm/apic.h>
+#include <xen/interface/physdev.h>
+#include <asm/xen/hypercall.h>
 
 unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
 {
+	struct physdev_apic apic_op;
+	int ret;
+
+	apic_op.apic_physbase = mpc_ioapic_addr(apic);
+	apic_op.reg = reg;
+	ret = HYPERVISOR_physdev_op(PHYSDEVOP_apic_read, &apic_op);
+	if (!ret)
+		return apic_op.value;
+
+	/* fallback to return an emulated IO_APIC values */
 	if (reg == 0x1)
 		return 0x00170020;
 	else if (reg == 0x0)