[SPARC64]: asm/cpudata.h needs asm/asi.h

[safe/jmp/linux-2.6] / include / asm-sparc64 / cpudata.h

diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index 26b1dc9..8a171ad 100644 (file)
--- a/include/asm-sparc64/cpudata.h
+++ b/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.  */