diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:20:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 23:20:56 -0400 |
| commit | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (patch) | |
| tree | 2f58c263c9d05ca5f96b22c3964dea1bc8ea2e57 /arch/sparc64/kernel/tsb.S | |
| parent | a9cf7cd0d7474026d05296c666a0b7f83d798c03 (diff) | |
| parent | 24d559cac4d741d60ec85e927974408020a2f060 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: store-init needs trailing membar.
Diffstat (limited to 'arch/sparc64/kernel/tsb.S')
| -rw-r--r-- | arch/sparc64/kernel/tsb.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S index eedf94fa5664..10adb2fb8ffe 100644 --- a/arch/sparc64/kernel/tsb.S +++ b/arch/sparc64/kernel/tsb.S | |||
| @@ -546,6 +546,7 @@ NGtsb_init: | |||
| 546 | subcc %o1, 0x100, %o1 | 546 | subcc %o1, 0x100, %o1 |
| 547 | bne,pt %xcc, 1b | 547 | bne,pt %xcc, 1b |
| 548 | add %o0, 0x100, %o0 | 548 | add %o0, 0x100, %o0 |
| 549 | membar #Sync | ||
| 549 | retl | 550 | retl |
| 550 | wr %g2, 0x0, %asi | 551 | wr %g2, 0x0, %asi |
| 551 | .size NGtsb_init, .-NGtsb_init | 552 | .size NGtsb_init, .-NGtsb_init |