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/lib/NGpage.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/lib/NGpage.S')
| -rw-r--r-- | arch/sparc64/lib/NGpage.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/lib/NGpage.S b/arch/sparc64/lib/NGpage.S index 7d7c3bb8dcbf..8ce3a0c9c537 100644 --- a/arch/sparc64/lib/NGpage.S +++ b/arch/sparc64/lib/NGpage.S | |||
| @@ -41,6 +41,7 @@ NGcopy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ | |||
| 41 | subcc %g7, 64, %g7 | 41 | subcc %g7, 64, %g7 |
| 42 | bne,pt %xcc, 1b | 42 | bne,pt %xcc, 1b |
| 43 | add %o0, 32, %o0 | 43 | add %o0, 32, %o0 |
| 44 | membar #Sync | ||
| 44 | retl | 45 | retl |
| 45 | nop | 46 | nop |
| 46 | 47 | ||
| @@ -63,6 +64,7 @@ NGclear_user_page: /* %o0=dest, %o1=vaddr */ | |||
| 63 | subcc %g7, 64, %g7 | 64 | subcc %g7, 64, %g7 |
| 64 | bne,pt %xcc, 1b | 65 | bne,pt %xcc, 1b |
| 65 | add %o0, 32, %o0 | 66 | add %o0, 32, %o0 |
| 67 | membar #Sync | ||
| 66 | retl | 68 | retl |
| 67 | nop | 69 | nop |
| 68 | 70 | ||