Skip to content

L
linux-davinci
Commit fe0c9f58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 6772926b fef43da4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
arch/sparc64/mm/ultra.S
View file @ fe0c9f58
...@@ -72,6 +72,7 @@ __flush_tlb_pending: ...@@ -72,6 +72,7 @@ __flush_tlb_pending:
flush %g6 flush %g6
retl retl
wrpr %g7, 0x0, %pstate wrpr %g7, 0x0, %pstate
nop
.align 32 .align 32
.globl __flush_tlb_kernel_range .globl __flush_tlb_kernel_range
...@@ -249,7 +250,7 @@ __cheetah_flush_tlb_mm: /* 15 insns */ ...@@ -249,7 +250,7 @@ __cheetah_flush_tlb_mm: /* 15 insns */
retl retl
wrpr %g7, 0x0, %pstate wrpr %g7, 0x0, %pstate
__cheetah_flush_tlb_pending: /* 22 insns */ __cheetah_flush_tlb_pending: /* 23 insns */
/* %o0 = context, %o1 = nr, %o2 = vaddrs[] */ /* %o0 = context, %o1 = nr, %o2 = vaddrs[] */
rdpr %pstate, %g7 rdpr %pstate, %g7
sllx %o1, 3, %o1 sllx %o1, 3, %o1
...@@ -317,7 +318,7 @@ cheetah_patch_cachetlbops: ...@@ -317,7 +318,7 @@ cheetah_patch_cachetlbops:
sethi %hi(__cheetah_flush_tlb_pending), %o1 sethi %hi(__cheetah_flush_tlb_pending), %o1
or %o1, %lo(__cheetah_flush_tlb_pending), %o1 or %o1, %lo(__cheetah_flush_tlb_pending), %o1
call cheetah_patch_one call cheetah_patch_one
mov 22, %o2 mov 23, %o2
#ifdef DCACHE_ALIASING_POSSIBLE #ifdef DCACHE_ALIASING_POSSIBLE
sethi %hi(__flush_dcache_page), %o0 sethi %hi(__flush_dcache_page), %o0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment