tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds 0a14fe6e a9cf7cd0

+6
unified split
+1
arch/sparc64/kernel/tsb.S
··· 546 546 subcc %o1, 0x100, %o1 547 547 bne,pt %xcc, 1b 548 548 add %o0, 0x100, %o0 549 + membar #Sync 549 550 retl 550 551 wr %g2, 0x0, %asi 551 552 .size NGtsb_init, .-NGtsb_init
+1
arch/sparc64/lib/NGbzero.S
··· 88 88 bne,pt %xcc, NGbzero_loop 89 89 add %o0, 64, %o0 90 90 91 + membar #Sync 91 92 wr %o4, 0x0, %asi 92 93 brz,pn %o1, NGbzero_done 93 94 NGbzero_medium:
+2
arch/sparc64/lib/NGmemcpy.S
··· 247 247 /* fall through */ 248 248 249 249 60: 250 + membar #Sync 251 + 250 252 /* %o2 contains any final bytes still needed to be copied 251 253 * over. If anything is left, we copy it one byte at a time. 252 254 */
+2
arch/sparc64/lib/NGpage.S
··· 41 41 subcc %g7, 64, %g7 42 42 bne,pt %xcc, 1b 43 43 add %o0, 32, %o0 44 + membar #Sync 44 45 retl 45 46 nop 46 47 ··· 64 63 subcc %g7, 64, %g7 65 64 bne,pt %xcc, 1b 66 65 add %o0, 32, %o0 66 + membar #Sync 67 67 retl 68 68 nop 69 69