projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8591e30)
[SPARC64]: asm/cpudata.h needs asm/asi.h
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 8 Feb 2006 05:15:41 +0000 (21:15 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:11:55 +0000 (01:11 -0800)
For the expansion of __GET_CPUID() on SMP.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/asm-sparc64/cpudata.h patch | blob | blame | history

diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index 26b1dc9afbf1f5d981e3d047a1cd0de01e7dca40..8a171ad7727482f66c18bc41f7ebe98e88604bc0 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.  */