diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
| commit | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch) | |
| tree | 575f59b6a0918b11f7c763aecf0c3e70478460d2 /arch/sparc64/kernel/trampoline.S | |
| parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/sparc64/kernel/trampoline.S')
| -rw-r--r-- | arch/sparc64/kernel/trampoline.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 2c8f9344b4e..3a145fc39cf 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S @@ -98,8 +98,9 @@ startup_continue: sethi %hi(prom_entry_lock), %g2 1: ldstub [%g2 + %lo(prom_entry_lock)], %g1 + membar #StoreLoad | #StoreStore brnz,pn %g1, 1b - membar #StoreLoad | #StoreStore + nop sethi %hi(p1275buf), %g2 or %g2, %lo(p1275buf), %g2 |