diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-10 01:57:21 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 04:12:14 -0500 |
commit | 164c220fa3947abbada65329d168f421b461a2a7 (patch) | |
tree | 1a10418ccf896f1f9209c2206bedf87915b63bfd /arch/sparc64/kernel/trampoline.S | |
parent | dedacf623283cb24933ec9f7d5bf539f19173cd4 (diff) |
[SPARC64]: Fix hypervisor call arg passing.
Function goes in %o5, args go in %o0 --> %o5.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/trampoline.S')
-rw-r--r-- | arch/sparc64/kernel/trampoline.S | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index ffa8b79632cf..c476f5b321fb 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
@@ -265,20 +265,20 @@ do_unlock: | |||
265 | nop | 265 | nop |
266 | 266 | ||
267 | niagara_lock_tlb: | 267 | niagara_lock_tlb: |
268 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o0 | 268 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 |
269 | sethi %hi(KERNBASE), %o1 | 269 | sethi %hi(KERNBASE), %o0 |
270 | clr %o2 | 270 | clr %o1 |
271 | sethi %hi(kern_locked_tte_data), %o3 | 271 | sethi %hi(kern_locked_tte_data), %o2 |
272 | ldx [%o3 + %lo(kern_locked_tte_data)], %o3 | 272 | ldx [%o2 + %lo(kern_locked_tte_data)], %o2 |
273 | mov HV_MMU_IMMU, %o4 | 273 | mov HV_MMU_IMMU, %o3 |
274 | ta HV_FAST_TRAP | 274 | ta HV_FAST_TRAP |
275 | 275 | ||
276 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o0 | 276 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 |
277 | sethi %hi(KERNBASE), %o1 | 277 | sethi %hi(KERNBASE), %o0 |
278 | clr %o2 | 278 | clr %o1 |
279 | sethi %hi(kern_locked_tte_data), %o3 | 279 | sethi %hi(kern_locked_tte_data), %o2 |
280 | ldx [%o3 + %lo(kern_locked_tte_data)], %o3 | 280 | ldx [%o2 + %lo(kern_locked_tte_data)], %o2 |
281 | mov HV_MMU_DMMU, %o4 | 281 | mov HV_MMU_DMMU, %o3 |
282 | ta HV_FAST_TRAP | 282 | ta HV_FAST_TRAP |
283 | 283 | ||
284 | sethi %hi(bigkernel), %g2 | 284 | sethi %hi(bigkernel), %g2 |
@@ -286,24 +286,24 @@ niagara_lock_tlb: | |||
286 | brz,pt %g2, after_lock_tlb | 286 | brz,pt %g2, after_lock_tlb |
287 | nop | 287 | nop |
288 | 288 | ||
289 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o0 | 289 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 |
290 | sethi %hi(KERNBASE + 0x400000), %o1 | 290 | sethi %hi(KERNBASE + 0x400000), %o0 |
291 | clr %o2 | 291 | clr %o1 |
292 | sethi %hi(kern_locked_tte_data), %o3 | 292 | sethi %hi(kern_locked_tte_data), %o2 |
293 | ldx [%o3 + %lo(kern_locked_tte_data)], %o3 | 293 | ldx [%o2 + %lo(kern_locked_tte_data)], %o2 |
294 | sethi %hi(0x400000), %o4 | 294 | sethi %hi(0x400000), %o3 |
295 | add %o3, %o4, %o3 | 295 | add %o2, %o3, %o2 |
296 | mov HV_MMU_IMMU, %o4 | 296 | mov HV_MMU_IMMU, %o3 |
297 | ta HV_FAST_TRAP | 297 | ta HV_FAST_TRAP |
298 | 298 | ||
299 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o0 | 299 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 |
300 | sethi %hi(KERNBASE + 0x400000), %o1 | 300 | sethi %hi(KERNBASE + 0x400000), %o0 |
301 | clr %o2 | 301 | clr %o1 |
302 | sethi %hi(kern_locked_tte_data), %o3 | 302 | sethi %hi(kern_locked_tte_data), %o2 |
303 | ldx [%o3 + %lo(kern_locked_tte_data)], %o3 | 303 | ldx [%o2 + %lo(kern_locked_tte_data)], %o2 |
304 | sethi %hi(0x400000), %o4 | 304 | sethi %hi(0x400000), %o3 |
305 | add %o3, %o4, %o3 | 305 | add %o2, %o3, %o2 |
306 | mov HV_MMU_DMMU, %o4 | 306 | mov HV_MMU_DMMU, %o3 |
307 | ta HV_FAST_TRAP | 307 | ta HV_FAST_TRAP |
308 | 308 | ||
309 | after_lock_tlb: | 309 | after_lock_tlb: |