Skip to contentSkip to conversation

powerpc: add a missing label in resume_kernel

PATCH In review Kevin Hao 2 participants 2 messages Apr 10, 2013 PowerPC

lore
Share & tools
lore

Kevin Hao

author
#0 lore raw

PATCH 1/1 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.

---
 arch/powerpc/kernel/entry_64.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/entry_64.S +1 -1
index 256c5bf..ab079ed 100644
@@ -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
Signature · 1 line
1.8.1.4
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Kevin Hao

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.

Quoted 19 lines
---
  arch/powerpc/kernel/entry_64.S | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/entry_64.S +1 -1
index 256c5bf..ab079ed 100644
@@ -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