diff options
| author | David S. Miller <davem@davemloft.net> | 2005-07-05 19:45:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-05 19:45:24 -0700 |
| commit | fef43da4e4341697a682f5aae1d5d428e840bc61 (patch) | |
| tree | f7ba677e7aa1824bfc6e6fa434e42cd62207d653 /arch/sparc64 | |
| parent | d06e7a56d91328267a96b1a4df4ede7529f829e8 (diff) | |
| download | linux-fef43da4e4341697a682f5aae1d5d428e840bc61.tar.gz linux-fef43da4e4341697a682f5aae1d5d428e840bc61.tar.bz2 linux-fef43da4e4341697a682f5aae1d5d428e840bc61.zip | |
[SPARC64]: Fix UltraSPARC-III fallout from membar changes.
The membar changes made the size of __cheetah_flush_tlb_pending
grow by one instruction, but the boot-time code patching was
not updated to match.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
| -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 7a2431d3abc7..363770893797 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 |