aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r--arch/sparc64/kernel/irq.c8
-rw-r--r--arch/sparc64/kernel/smp.c16
-rw-r--r--arch/sparc64/kernel/trampoline.S56
-rw-r--r--arch/sparc64/kernel/tsb.S6
4 files changed, 43 insertions, 43 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 1f6455503f2..c5dd6daf127 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -863,10 +863,10 @@ void init_irqwork_curcpu(void)
static void __cpuinit init_one_mondo(unsigned long *pa_ptr, unsigned long type)
{
- register unsigned long func __asm__("%o0");
- register unsigned long arg0 __asm__("%o1");
- register unsigned long arg1 __asm__("%o2");
- register unsigned long arg2 __asm__("%o3");
+ register unsigned long func __asm__("%o5");
+ register unsigned long arg0 __asm__("%o0");
+ register unsigned long arg1 __asm__("%o1");
+ register unsigned long arg2 __asm__("%o2");
unsigned long page = get_zeroed_page(GFP_ATOMIC);
if (!page) {
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index c10a3a8639e..f553264588d 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -572,10 +572,10 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
retries = 0;
cnt = init_cpu_list(cpu_list, mask);
do {
- register unsigned long func __asm__("%o0");
- register unsigned long arg0 __asm__("%o1");
- register unsigned long arg1 __asm__("%o2");
- register unsigned long arg2 __asm__("%o3");
+ register unsigned long func __asm__("%o5");
+ register unsigned long arg0 __asm__("%o0");
+ register unsigned long arg1 __asm__("%o1");
+ register unsigned long arg2 __asm__("%o2");
func = HV_FAST_CPU_MONDO_SEND;
arg0 = cnt;
@@ -624,10 +624,10 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
int retries = 0;
do {
- register unsigned long func __asm__("%o0");
- register unsigned long arg0 __asm__("%o1");
- register unsigned long arg1 __asm__("%o2");
- register unsigned long arg2 __asm__("%o3");
+ register unsigned long func __asm__("%o5");
+ register unsigned long arg0 __asm__("%o0");
+ register unsigned long arg1 __asm__("%o1");
+ register unsigned long arg2 __asm__("%o2");
cpu_list[0] = i;
func = HV_FAST_CPU_MONDO_SEND;
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index ffa8b79632c..c476f5b321f 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -265,20 +265,20 @@ do_unlock:
nop
niagara_lock_tlb:
- mov HV_FAST_MMU_MAP_PERM_ADDR, %o0
- sethi %hi(KERNBASE), %o1
- clr %o2
- sethi %hi(kern_locked_tte_data), %o3
- ldx [%o3 + %lo(kern_locked_tte_data)], %o3
- mov HV_MMU_IMMU, %o4
+ mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
+ sethi %hi(KERNBASE), %o0
+ clr %o1
+ sethi %hi(kern_locked_tte_data), %o2
+ ldx [%o2 + %lo(kern_locked_tte_data)], %o2
+ mov HV_MMU_IMMU, %o3
ta HV_FAST_TRAP
- mov HV_FAST_MMU_MAP_PERM_ADDR, %o0
- sethi %hi(KERNBASE), %o1
- clr %o2
- sethi %hi(kern_locked_tte_data), %o3
- ldx [%o3 + %lo(kern_locked_tte_data)], %o3
- mov HV_MMU_DMMU, %o4
+ mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
+ sethi %hi(KERNBASE), %o0
+ clr %o1
+ sethi %hi(kern_locked_tte_data), %o2
+ ldx [%o2 + %lo(kern_locked_tte_data)], %o2
+ mov HV_MMU_DMMU, %o3
ta HV_FAST_TRAP
sethi %hi(bigkernel), %g2
@@ -286,24 +286,24 @@ niagara_lock_tlb:
brz,pt %g2, after_lock_tlb
nop
- mov HV_FAST_MMU_MAP_PERM_ADDR, %o0
- sethi %hi(KERNBASE + 0x400000), %o1
- clr %o2
- sethi %hi(kern_locked_tte_data), %o3
- ldx [%o3 + %lo(kern_locked_tte_data)], %o3
- sethi %hi(0x400000), %o4
- add %o3, %o4, %o3
- mov HV_MMU_IMMU, %o4
+ mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
+ sethi %hi(KERNBASE + 0x400000), %o0
+ clr %o1
+ sethi %hi(kern_locked_tte_data), %o2
+ ldx [%o2 + %lo(kern_locked_tte_data)], %o2
+ sethi %hi(0x400000), %o3
+ add %o2, %o3, %o2
+ mov HV_MMU_IMMU, %o3
ta HV_FAST_TRAP
- mov HV_FAST_MMU_MAP_PERM_ADDR, %o0
- sethi %hi(KERNBASE + 0x400000), %o1
- clr %o2
- sethi %hi(kern_locked_tte_data), %o3
- ldx [%o3 + %lo(kern_locked_tte_data)], %o3
- sethi %hi(0x400000), %o4
- add %o3, %o4, %o3
- mov HV_MMU_DMMU, %o4
+ mov HV_FAST_MMU_MAP_PERM_ADDR, %o5
+ sethi %hi(KERNBASE + 0x400000), %o0
+ clr %o1
+ sethi %hi(kern_locked_tte_data), %o2
+ ldx [%o2 + %lo(kern_locked_tte_data)], %o2
+ sethi %hi(0x400000), %o3
+ add %o2, %o3, %o2
+ mov HV_MMU_DMMU, %o3
ta HV_FAST_TRAP
after_lock_tlb:
diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S
index a53ec6fb769..8a9351258af 100644
--- a/arch/sparc64/kernel/tsb.S
+++ b/arch/sparc64/kernel/tsb.S
@@ -266,9 +266,9 @@ __tsb_context_switch:
mov SCRATCHPAD_UTSBREG2, %g1
stxa %g2, [%g1] ASI_SCRATCHPAD
- mov HV_FAST_MMU_TSB_CTXNON0, %o0
- mov 1, %o1
- mov %o4, %o2
+ mov HV_FAST_MMU_TSB_CTXNON0, %o5
+ mov 1, %o0
+ mov %o4, %o1
ta HV_FAST_TRAP
ba,pt %xcc, 9f