diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/sparc64/lib/NGpage.S | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
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 | ||