From 2662ff420d420f1b3350d072abb9c0ce397834af Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Tue, 9 Apr 2013 22:31:24 +0000 Subject: [PATCH] --- yaml --- r: 362547 b: refs/heads/master c: d8b92292408831d86ff7b781e66bf79301934b99 h: refs/heads/master i: 362545: 6ad9e3957544c69418e1d05d72ebc9dc704ec771 362543: 0e42520732f0cae79fdc22295c544905ca2d8d88 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2536dc479036..634ab6ba5380 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05e38e5d5d437c762c79428ae8434632a8ca2c5e +refs/heads/master: d8b92292408831d86ff7b781e66bf79301934b99 diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S index 3acb1a076d3f..04d69c4a5ac2 100644 --- a/trunk/arch/powerpc/kernel/entry_64.S +++ b/trunk/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