diff options
| author | David S. Miller <davem@davemloft.net> | 2005-08-29 12:46:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-08-29 12:46:22 -0700 |
| commit | 4f07118f656c179740cad35b827032e2e29b1210 (patch) | |
| tree | 7ddeb17346fe25ae75aa5373659c053afb9ef5f5 /arch/sparc64/solaris | |
| parent | 442464a50077ff00454ff8d7628cbe1b8eacc034 (diff) | |
| download | op-kernel-dev-4f07118f656c179740cad35b827032e2e29b1210.zip op-kernel-dev-4f07118f656c179740cad35b827032e2e29b1210.tar.gz | |
[SPARC64]: More fully work around Spitfire Errata 51.
It appears that a memory barrier soon after a mispredicted
branch, not just in the delay slot, can cause the hang
condition of this cpu errata.
So move them out-of-line, and explicitly put them into
a "branch always, predict taken" delay slot which should
fully kill this problem.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/solaris')
| -rw-r--r-- | arch/sparc64/solaris/misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index 15b4cfe..302efbc 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c @@ -737,7 +737,8 @@ MODULE_LICENSE("GPL"); extern u32 tl0_solaris[8]; #define update_ttable(x) \ tl0_solaris[3] = (((long)(x) - (long)tl0_solaris - 3) >> 2) | 0x40000000; \ - __asm__ __volatile__ ("membar #StoreStore; flush %0" : : "r" (&tl0_solaris[3])) + wmb(); \ + __asm__ __volatile__ ("flush %0" : : "r" (&tl0_solaris[3])) #else #endif @@ -761,7 +762,8 @@ int init_module(void) entry64_personality_patch |= (offsetof(struct task_struct, personality) + (sizeof(unsigned long) - 1)); - __asm__ __volatile__("membar #StoreStore; flush %0" + wmb(); + __asm__ __volatile__("flush %0" : : "r" (&entry64_personality_patch)); return 0; } |
