From f33b4fbf5ba47bac7add22ae266915231e676cd9 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Tue, 18 Nov 2008 19:19:50 +0900
Subject: [PATCH] --- yaml --- r: 119287 b: refs/heads/master c:
 93fe10b670a7a6a1dc9649c7860f452dc7bbbb9d h: refs/heads/master i:   119285:
 fa78f34285f46574ca69b95a1bd0903d5ae6b826   119283:
 6c28b29e2fd21675d9d75a7ce7a6633ddaf7dcaf   119279:
 c746ae439fa1fe2b2890f272d4b3d6a65c9d8646 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/ia64/include/asm/intrinsics.h      |  2 +-
 trunk/arch/ia64/include/asm/paravirt_privop.h | 13 +++++++++++++
 trunk/arch/ia64/kernel/paravirt.c             |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c9f00d0122f0..8d5dd30d8a19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5964107763d7155e9bea658098a337507b3e928
+refs/heads/master: 93fe10b670a7a6a1dc9649c7860f452dc7bbbb9d
diff --git a/trunk/arch/ia64/include/asm/intrinsics.h b/trunk/arch/ia64/include/asm/intrinsics.h
index 47d686dba1eb..a3e44a5ed497 100644
--- a/trunk/arch/ia64/include/asm/intrinsics.h
+++ b/trunk/arch/ia64/include/asm/intrinsics.h
@@ -226,7 +226,7 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);
 /************************************************/
 #define ia64_ssm			IA64_INTRINSIC_MACRO(ssm)
 #define ia64_rsm			IA64_INTRINSIC_MACRO(rsm)
-#define ia64_getreg			IA64_INTRINSIC_API(getreg)
+#define ia64_getreg			IA64_INTRINSIC_MACRO(getreg)
 #define ia64_setreg			IA64_INTRINSIC_API(setreg)
 #define ia64_set_rr			IA64_INTRINSIC_API(set_rr)
 #define ia64_get_rr			IA64_INTRINSIC_API(get_rr)
diff --git a/trunk/arch/ia64/include/asm/paravirt_privop.h b/trunk/arch/ia64/include/asm/paravirt_privop.h
index d577aac11835..0b597424fcfc 100644
--- a/trunk/arch/ia64/include/asm/paravirt_privop.h
+++ b/trunk/arch/ia64/include/asm/paravirt_privop.h
@@ -78,6 +78,19 @@ extern unsigned long ia64_native_getreg_func(int regnum);
 			ia64_native_rsm(mask);	\
 	} while (0)
 
+/* returned ip value should be the one in the caller,
+ * not in __paravirt_getreg() */
+#define paravirt_getreg(reg)					\
+	({							\
+		unsigned long res;				\
+		BUILD_BUG_ON(!__builtin_constant_p(reg));	\
+		if ((reg) == _IA64_REG_IP)			\
+			res = ia64_native_getreg(_IA64_REG_IP); \
+		else						\
+			res = pv_cpu_ops.getreg(reg);		\
+		res;						\
+	})
+
 /******************************************************************************
  * replacement of hand written assembly codes.
  */
diff --git a/trunk/arch/ia64/kernel/paravirt.c b/trunk/arch/ia64/kernel/paravirt.c
index de35d8e8b7d2..9f14c16f6369 100644
--- a/trunk/arch/ia64/kernel/paravirt.c
+++ b/trunk/arch/ia64/kernel/paravirt.c
@@ -130,7 +130,7 @@ ia64_native_getreg_func(int regnum)
 	unsigned long res = -1;
 	switch (regnum) {
 	CASE_GET_REG(GP);
-	CASE_GET_REG(IP);
+	/*CASE_GET_REG(IP);*/ /* returned ip value shouldn't be constant */
 	CASE_GET_REG(PSR);
 	CASE_GET_REG(TP);
 	CASE_GET_REG(SP);