diff --git a/[refs] b/[refs] index 4a7f98b6aef0..c0f4c7e96a8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93a07d0a0e7b013ee73fb39d4edb07b47288912e +refs/heads/master: a37d98f6a98254c05315e0bbf45c4602942d14b1 diff --git a/trunk/arch/ia64/kernel/entry.S b/trunk/arch/ia64/kernel/entry.S index 73e23dafe8e9..bd86fea49a0c 100644 --- a/trunk/arch/ia64/kernel/entry.S +++ b/trunk/arch/ia64/kernel/entry.S @@ -759,7 +759,7 @@ ENTRY(ia64_leave_syscall) (pUStk) st1 [r14]=r17 addl r3=THIS_CPU(ia64_phys_stacked_size_p8),r0 ;; -(pUStk) ld4 r3=[r3] // r3 = cpu_data->phys_stacked_size_p8 +(pUStk) ld4 r17=[r3] // r17 = cpu_data->phys_stacked_size_p8 mov.m ar.csd=r0 // M2 clear ar.csd mov b6=r18 // I0 restore b6 ;;