From 5920a2022f07d5229985d9140fa7a7e481831634 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 7 Feb 2006 21:15:41 -0800
Subject: [PATCH] --- yaml --- r: 21384 b: refs/heads/master c:
 89a5264f065672a882f555228000614a6b2182b7 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-sparc64/cpudata.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d74adcc2e1c1..99b84aa8890d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8591e3027235d6d11b958e43379f2ee7b7114841
+refs/heads/master: 89a5264f065672a882f555228000614a6b2182b7
diff --git a/trunk/include/asm-sparc64/cpudata.h b/trunk/include/asm-sparc64/cpudata.h
index 26b1dc9afbf1..8a171ad77274 100644
--- a/trunk/include/asm-sparc64/cpudata.h
+++ b/trunk/include/asm-sparc64/cpudata.h
@@ -7,6 +7,7 @@
 #define _SPARC64_CPUDATA_H
 
 #include <asm/hypervisor.h>
+#include <asm/asi.h>
 
 #ifndef __ASSEMBLY__
 
@@ -130,9 +131,9 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
 	lduwa		[REG] ASI_PHYS_BYPASS_EC_E, REG;\
 	/* sun4v implementation. */			\
 	mov		SCRATCHPAD_CPUID, REG;		\
-	nop;						\
 	ldxa		[REG] ASI_SCRATCHPAD, REG;	\
 	nop;						\
+	nop;						\
 	.previous;
 
 /* Clobbers TMP, current address space PGD phys address into DEST.  */