aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-07 21:15:41 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:11:55 -0800
commit89a5264f065672a882f555228000614a6b2182b7 (patch)
tree4fa226fed4b8119096e50ff8c915d2c0f8d6cd6d /include/asm-sparc64
parent8591e3027235d6d11b958e43379f2ee7b7114841 (diff)
[SPARC64]: asm/cpudata.h needs asm/asi.h
For the expansion of __GET_CPUID() on SMP. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r--include/asm-sparc64/cpudata.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index 26b1dc9afbf..8a171ad7727 100644
--- 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. */