[SPARC64]: Fix hypervisor call arg passing.
Function goes in %o5, args go in %o0 --> %o5.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index e602b85..7faba33 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -518,11 +518,11 @@
unsigned long pte,
unsigned long mmu)
{
- 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 arg3 asm("%o4");
+ register unsigned long func asm("%o5");
+ register unsigned long arg0 asm("%o0");
+ register unsigned long arg1 asm("%o1");
+ register unsigned long arg2 asm("%o2");
+ register unsigned long arg3 asm("%o3");
func = HV_FAST_MMU_MAP_PERM_ADDR;
arg0 = vaddr;
@@ -1112,18 +1112,18 @@
/* Register this cpu's fault status area with the hypervisor. */
void __cpuinit sun4v_register_fault_status(void)
{
+ register unsigned long func asm("%o5");
register unsigned long arg0 asm("%o0");
- register unsigned long arg1 asm("%o1");
int cpu = hard_smp_processor_id();
struct trap_per_cpu *tb = &trap_block[cpu];
unsigned long pa;
pa = kern_base + ((unsigned long) tb - KERNBASE);
- arg0 = HV_FAST_MMU_FAULT_AREA_CONF;
- arg1 = pa;
+ func = HV_FAST_MMU_FAULT_AREA_CONF;
+ arg0 = pa;
__asm__ __volatile__("ta %4"
- : "=&r" (arg0), "=&r" (arg1)
- : "0" (arg0), "1" (arg1),
+ : "=&r" (func), "=&r" (arg0)
+ : "0" (func), "1" (arg0),
"i" (HV_FAST_TRAP));
}