[PATCH] powerpc: add a missing label in resume_kernel

tiejun.chen tiejun.chen at windriver.com
Wed Apr 10 18:43:21 EST 2013


On 04/10/2013 04:31 PM, Kevin Hao wrote:
> A label 0 was missed in the patch a9c4e541 (powerpc/kprobe: Complete
> kprobe and migrate exception frame). This will cause the kernel
> branch to an undetermined address if there really has a conflict when
> updating the thread flags.
>
> Signed-off-by: Kevin Hao <haokexin at gmail.com>

Acked-By: Tiejun Chen <tiejun.chen at windriver.com>


> Cc: stable at vger.kernel.org
> ---
>   arch/powerpc/kernel/entry_64.S | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
> index 256c5bf..ab079ed 100644
> --- a/arch/powerpc/kernel/entry_64.S
> +++ b/arch/powerpc/kernel/entry_64.S
> @@ -657,7 +657,7 @@ resume_kernel:
>   	/* Clear _TIF_EMULATE_STACK_STORE flag */
>   	lis	r11,_TIF_EMULATE_STACK_STORE at h
>   	addi	r5,r9,TI_FLAGS
> -	ldarx	r4,0,r5
> +0:	ldarx	r4,0,r5
>   	andc	r4,r4,r11
>   	stdcx.	r4,0,r5
>   	bne-	0b
>



More information about the Linuxppc-dev mailing list