| From d8b92292408831d86ff7b781e66bf79301934b99 Mon Sep 17 00:00:00 2001 |
| From: Kevin Hao <haokexin@gmail.com> |
| Date: Tue, 9 Apr 2013 22:31:24 +0000 |
| Subject: powerpc: add a missing label in resume_kernel |
| |
| From: Kevin Hao <haokexin@gmail.com> |
| |
| commit d8b92292408831d86ff7b781e66bf79301934b99 upstream. |
| |
| 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> |
| Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/kernel/entry_64.S | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/kernel/entry_64.S |
| +++ b/arch/powerpc/kernel/entry_64.S |
| @@ -634,7 +634,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 |
