Patchwork powerpc: Fix another bug in move of altivec code to vector.S

login
register
mail settings
Submitter Andreas Schwab
Date July 10, 2009, 9:17 p.m.
Message ID <m2iqi0w83z.fsf@igel.home>
Download mbox | patch
Permalink /patch/29692/
State Accepted
Headers show

Comments

Andreas Schwab - July 10, 2009, 9:17 p.m.
When moving load_up_altivec to vector.S a typo in a comment caused a
thinko setting the wrong variable.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
Benjamin Herrenschmidt - July 10, 2009, 11:49 p.m.
On Fri, 2009-07-10 at 23:17 +0200, Andreas Schwab wrote:
> When moving load_up_altivec to vector.S a typo in a comment caused a
> thinko setting the wrong variable.
> 
> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>

Good catch, thanks.

Cheers,
Ben.

> ---
> diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
> index ef36cbb..ea4d646 100644
> --- a/arch/powerpc/kernel/vector.S
> +++ b/arch/powerpc/kernel/vector.S
> @@ -80,10 +80,10 @@ _GLOBAL(load_up_altivec)
>  	mtvscr	vr0
>  	REST_32VRS(0,r4,r5)
>  #ifndef CONFIG_SMP
> -	/* Update last_task_used_math to 'current' */
> +	/* Update last_task_used_altivec to 'current' */
>  	subi	r4,r5,THREAD		/* Back to 'current' */
>  	fromreal(r4)
> -	PPC_STL	r4,ADDROFF(last_task_used_math)(r3)
> +	PPC_STL	r4,ADDROFF(last_task_used_altivec)(r3)
>  #endif /* CONFIG_SMP */
>  	/* restore registers and return */
>  	blr
> @@ -172,7 +172,7 @@ _GLOBAL(load_up_vsx)
>  	oris	r12,r12,MSR_VSX@h
>  	std	r12,_MSR(r1)
>  #ifndef CONFIG_SMP
> -	/* Update last_task_used_math to 'current' */
> +	/* Update last_task_used_vsx to 'current' */
>  	ld	r4,PACACURRENT(r13)
>  	std	r4,0(r3)
>  #endif /* CONFIG_SMP */
>

Patch

diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index ef36cbb..ea4d646 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -80,10 +80,10 @@  _GLOBAL(load_up_altivec)
 	mtvscr	vr0
 	REST_32VRS(0,r4,r5)
 #ifndef CONFIG_SMP
-	/* Update last_task_used_math to 'current' */
+	/* Update last_task_used_altivec to 'current' */
 	subi	r4,r5,THREAD		/* Back to 'current' */
 	fromreal(r4)
-	PPC_STL	r4,ADDROFF(last_task_used_math)(r3)
+	PPC_STL	r4,ADDROFF(last_task_used_altivec)(r3)
 #endif /* CONFIG_SMP */
 	/* restore registers and return */
 	blr
@@ -172,7 +172,7 @@  _GLOBAL(load_up_vsx)
 	oris	r12,r12,MSR_VSX@h
 	std	r12,_MSR(r1)
 #ifndef CONFIG_SMP
-	/* Update last_task_used_math to 'current' */
+	/* Update last_task_used_vsx to 'current' */
 	ld	r4,PACACURRENT(r13)
 	std	r4,0(r3)
 #endif /* CONFIG_SMP */