From c13663a8239c63024f8fd2ac89990dff9f3f150b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 12 Oct 2008 23:56:12 -0700
Subject: [PATCH] --- yaml --- r: 113717 b: refs/heads/master c:
 615c9136b385d5225d3ece20aa30b28a90c438d6 h: refs/heads/master i:   113715:
 80736279957aa9dfe16ff3cc6e2695dcbf1f5436 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/chmc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72693f1e3f18..b4fe7fb5d82f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82960b8543cca5797a5e2841a9c43b8c5c669e65
+refs/heads/master: 615c9136b385d5225d3ece20aa30b28a90c438d6
diff --git a/trunk/arch/sparc64/kernel/chmc.c b/trunk/arch/sparc64/kernel/chmc.c
index 967b04886822..3b9f4d6e14a9 100644
--- a/trunk/arch/sparc64/kernel/chmc.c
+++ b/trunk/arch/sparc64/kernel/chmc.c
@@ -831,7 +831,7 @@ static int __init us3mc_init(void)
 	if (!us3mc_platform())
 		return -ENODEV;
 
-	__asm__ ("rdpr %%ver, %0" : "=r" (ver));
+	__asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));
 	if ((ver >> 32UL) == __JALAPENO_ID ||
 	    (ver >> 32UL) == __SERRANO_ID) {
 		mc_type = MC_TYPE_JBUS;