Patchwork powerpc: add a missing label in resume_kernel

login
register
mail settings
Submitter Kevin Hao
Date April 10, 2013, 8:31 a.m.
Message ID <1365582684-11136-1-git-send-email-haokexin@gmail.com>
Download mbox | patch
Permalink /patch/235336/
State Accepted, archived
Delegated to: Stephen Rothwell
Headers show

Comments

Kevin Hao - April 10, 2013, 8:31 a.m.
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@gmail.com>
Cc: stable@vger.kernel.org
---
 arch/powerpc/kernel/entry_64.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tiejun Chen - April 10, 2013, 8:43 a.m.
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@gmail.com>

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


> Cc: stable@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@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
>

Patch

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@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