diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
| commit | e766f1cc596078b1603ac2c96617660c4c7e2d81 (patch) | |
| tree | 86f24a621dbe39fd25dcec539c2f969f50bfbcab /arch/sparc64/kernel/head.S | |
| parent | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (diff) | |
| parent | ebede60741e2cec6d210f137fd22a30e37abc0be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/head.S')
| -rw-r--r-- | arch/sparc64/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 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: | |||
| 538 | nop | 538 | nop |
| 539 | call cheetah_plus_patch_winfixup | 539 | call cheetah_plus_patch_winfixup |
| 540 | nop | 540 | nop |
| 541 | |||
| 542 | 541 | ||
| 543 | 2: /* Patch copy/page operations to cheetah optimized versions. */ | 542 | 2: /* Patch copy/page operations to cheetah optimized versions. */ |
| 544 | call cheetah_patch_copyops | 543 | call cheetah_patch_copyops |
| 545 | nop | 544 | nop |
| 545 | call cheetah_patch_copy_page | ||
| 546 | nop | ||
| 546 | call cheetah_patch_cachetlbops | 547 | call cheetah_patch_cachetlbops |
| 547 | nop | 548 | nop |
| 548 | 549 | ||