diff options
| author | David S. Miller | 2005-08-30 20:26:15 +0200 |
|---|---|---|
| committer | David S. Miller | 2005-08-30 20:26:15 +0200 |
| commit | dbd2fdf549317de00e0b5ea465de5372039b7ee8 (patch) | |
| tree | 67fad29313468b3f232264e98b508d9f3bd6a4de /arch | |
| parent | [SPARC64]: Eliminate irq_cpustat_t. (diff) | |
| download | kernel-qcow2-linux-dbd2fdf549317de00e0b5ea465de5372039b7ee8.tar.gz kernel-qcow2-linux-dbd2fdf549317de00e0b5ea465de5372039b7ee8.tar.xz kernel-qcow2-linux-dbd2fdf549317de00e0b5ea465de5372039b7ee8.zip | |
[SPARC64]: Kill BRANCH_IF_ANY_CHEETAH() from copy page.
Just patch the branch at boot time instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/head.S | 3 | ||||
| -rw-r--r-- | arch/sparc64/lib/copy_page.S | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S index 8104a56ca2d8..1fa06c4e3bdb 100644 --- a/arch/sparc64/kernel/head.S +++ b/arch/sparc64/kernel/head.S @@ -538,11 +538,12 @@ cheetah_tlb_fixup: nop call cheetah_plus_patch_winfixup nop - 2: /* Patch copy/page operations to cheetah optimized versions. */ call cheetah_patch_copyops nop + call cheetah_patch_copy_page + nop call cheetah_patch_cachetlbops nop diff --git a/arch/sparc64/lib/copy_page.S b/arch/sparc64/lib/copy_page.S index 23ebf2c970b7..feebb14fd27a 100644 --- a/arch/sparc64/lib/copy_page.S +++ b/arch/sparc64/lib/copy_page.S @@ -87,7 +87,7 @@ copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ membar #Sync wrpr %o2, 0x0, %pstate - BRANCH_IF_ANY_CHEETAH(g3,o2,1f) +cheetah_copy_page_insn: ba,pt %xcc, 9f nop @@ -240,3 +240,14 @@ copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ stw %o4, [%g6 + TI_PRE_COUNT] .size copy_user_page, .-copy_user_page + + .globl cheetah_patch_copy_page +cheetah_patch_copy_page: + sethi %hi(0x01000000), %o1 ! NOP + sethi %hi(cheetah_copy_page_insn), %o0 + or %o0, %lo(cheetah_copy_page_insn), %o0 + stw %o1, [%o0] + membar #StoreStore + flush %o0 + retl + nop |