diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 20:37:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 20:37:09 -0700 |
| commit | fe0c9f58779988e769da544d54b660c76506e78f (patch) | |
| tree | 3a326bc7f13c3c4406c9924c739502326d4689f9 | |
| parent | 6772926bef3c9f0ec761b39e5702535471fff70b (diff) | |
| parent | fef43da4e4341697a682f5aae1d5d428e840bc61 (diff) | |
| download | op-kernel-dev-fe0c9f58779988e769da544d54b660c76506e78f.zip op-kernel-dev-fe0c9f58779988e769da544d54b660c76506e78f.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/mm/ultra.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 7a2431d..3637708 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S @@ -72,6 +72,7 @@ __flush_tlb_pending: flush %g6 retl wrpr %g7, 0x0, %pstate + nop .align 32 .globl __flush_tlb_kernel_range @@ -249,7 +250,7 @@ __cheetah_flush_tlb_mm: /* 15 insns */ retl wrpr %g7, 0x0, %pstate -__cheetah_flush_tlb_pending: /* 22 insns */ +__cheetah_flush_tlb_pending: /* 23 insns */ /* %o0 = context, %o1 = nr, %o2 = vaddrs[] */ rdpr %pstate, %g7 sllx %o1, 3, %o1 @@ -317,7 +318,7 @@ cheetah_patch_cachetlbops: sethi %hi(__cheetah_flush_tlb_pending), %o1 or %o1, %lo(__cheetah_flush_tlb_pending), %o1 call cheetah_patch_one - mov 22, %o2 + mov 23, %o2 #ifdef DCACHE_ALIASING_POSSIBLE sethi %hi(__flush_dcache_page), %o0 |
