diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:22 -0400 |
| commit | c36ad397a30fcf9369d82584324cc24189eb6b1c (patch) | |
| tree | a5cbb451a2e9ea3ea12b6d279c72d77ac96c3028 /arch/sparc64/mm/ultra.S | |
| parent | c903e41e67046e7f52bbc404bd5aa654d12540cc (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/sparc64/mm/ultra.S')
| -rw-r--r-- | arch/sparc64/mm/ultra.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 7a0934321010..7a2431d3abc7 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
| @@ -266,8 +266,9 @@ __cheetah_flush_tlb_pending: /* 22 insns */ | |||
| 266 | andn %o3, 1, %o3 | 266 | andn %o3, 1, %o3 |
| 267 | stxa %g0, [%o3] ASI_IMMU_DEMAP | 267 | stxa %g0, [%o3] ASI_IMMU_DEMAP |
| 268 | 2: stxa %g0, [%o3] ASI_DMMU_DEMAP | 268 | 2: stxa %g0, [%o3] ASI_DMMU_DEMAP |
| 269 | membar #Sync | ||
| 269 | brnz,pt %o1, 1b | 270 | brnz,pt %o1, 1b |
| 270 | membar #Sync | 271 | nop |
| 271 | stxa %g2, [%o4] ASI_DMMU | 272 | stxa %g2, [%o4] ASI_DMMU |
| 272 | flush %g6 | 273 | flush %g6 |
| 273 | wrpr %g0, 0, %tl | 274 | wrpr %g0, 0, %tl |