Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 03:37:09 +0000 (20:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 03:37:09 +0000 (20:37 -0700)
arch/sparc64/mm/ultra.S

index 7a2431d3abc7e9057d862add7040d97f56849d91..363770893797770233005c315d7644ff902272a7 100644 (file)
@@ -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