From b5094f86d70b9c9b64d5623e925b88cffd48b65a Mon Sep 17 00:00:00 2001
From: Lin Ming <mlin@ss.pku.edu.cn>
Date: Tue, 1 May 2012 00:16:27 +0800
Subject: [PATCH] --- yaml --- r: 305013 b: refs/heads/master c:
 ab6ec39a191243b9968bb9ac7f26cc7ec30c618b h: refs/heads/master i:   305011:
 2cf171afc3bcc903bc8334d579cd1c60a7a32f26 v: v3

---
 [refs]                    |  2 +-
 trunk/arch/x86/xen/apic.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c2115fdad953..bc4e9703bef1 100644
--- 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
index 73ade38caa32..1913bf2d2a9c 100644
--- 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)