Commit d8b92292 authored by Kevin Hao's avatar Kevin Hao Committed by Stephen Rothwell

powerpc: add a missing label in resume_kernel

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: default avatarKevin Hao <haokexin@gmail.com>
Cc: stable@vger.kernel.org
Acked-By: default avatarTiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 05e38e5d
...@@ -657,7 +657,7 @@ resume_kernel: ...@@ -657,7 +657,7 @@ resume_kernel:
/* Clear _TIF_EMULATE_STACK_STORE flag */ /* Clear _TIF_EMULATE_STACK_STORE flag */
lis r11,_TIF_EMULATE_STACK_STORE@h lis r11,_TIF_EMULATE_STACK_STORE@h
addi r5,r9,TI_FLAGS addi r5,r9,TI_FLAGS
ldarx r4,0,r5 0: ldarx r4,0,r5
andc r4,r4,r11 andc r4,r4,r11
stdcx. r4,0,r5 stdcx. r4,0,r5
bne- 0b bne- 0b
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment