diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:20:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:20:56 -0700 |
| commit | 0a14fe6e5efd0af0f9c6c01e0433445d615d0110 (patch) | |
| tree | 2f58c263c9d05ca5f96b22c3964dea1bc8ea2e57 | |
| parent | a9cf7cd0d7474026d05296c666a0b7f83d798c03 (diff) | |
| parent | 24d559cac4d741d60ec85e927974408020a2f060 (diff) | |
| download | kernel_samsung_tuna-0a14fe6e5efd0af0f9c6c01e0433445d615d0110.zip kernel_samsung_tuna-0a14fe6e5efd0af0f9c6c01e0433445d615d0110.tar.gz kernel_samsung_tuna-0a14fe6e5efd0af0f9c6c01e0433445d615d0110.tar.bz2 | |
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.
| -rw-r--r-- | arch/sparc64/kernel/tsb.S | 1 | ||||
| -rw-r--r-- | arch/sparc64/lib/NGbzero.S | 1 | ||||
| -rw-r--r-- | arch/sparc64/lib/NGmemcpy.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/NGpage.S | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S index eedf94f..10adb2f 100644 --- a/arch/sparc64/kernel/tsb.S +++ b/arch/sparc64/kernel/tsb.S @@ -546,6 +546,7 @@ NGtsb_init: subcc %o1, 0x100, %o1 bne,pt %xcc, 1b add %o0, 0x100, %o0 + membar #Sync retl wr %g2, 0x0, %asi .size NGtsb_init, .-NGtsb_init diff --git a/arch/sparc64/lib/NGbzero.S b/arch/sparc64/lib/NGbzero.S index e86baec..f10e452 100644 --- a/arch/sparc64/lib/NGbzero.S +++ b/arch/sparc64/lib/NGbzero.S @@ -88,6 +88,7 @@ NGbzero_loop: bne,pt %xcc, NGbzero_loop add %o0, 64, %o0 + membar #Sync wr %o4, 0x0, %asi brz,pn %o1, NGbzero_done NGbzero_medium: diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S index 8e522b3..66063a9 100644 --- a/arch/sparc64/lib/NGmemcpy.S +++ b/arch/sparc64/lib/NGmemcpy.S @@ -247,6 +247,8 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ /* fall through */ 60: + membar #Sync + /* %o2 contains any final bytes still needed to be copied * over. If anything is left, we copy it one byte at a time. */ diff --git a/arch/sparc64/lib/NGpage.S b/arch/sparc64/lib/NGpage.S index 7d7c3bb..8ce3a0c 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 */ subcc %g7, 64, %g7 bne,pt %xcc, 1b add %o0, 32, %o0 + membar #Sync retl nop @@ -63,6 +64,7 @@ NGclear_user_page: /* %o0=dest, %o1=vaddr */ subcc %g7, 64, %g7 bne,pt %xcc, 1b add %o0, 32, %o0 + membar #Sync retl nop |