From fd11ecf0b5b2dea7dcba09958b45e3c6c96c4bdf Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 4 Apr 2012 18:23:27 +0000 Subject: [PATCH] --- yaml --- r: 305335 b: refs/heads/master c: d14299dec74a094b0f26b0893eccf8aefdfbd007 h: refs/heads/master i: 305333: 59610882d3633917c6e47feb1191c36ac7b3c94a 305331: d3e102128e3497ae82c02b3058dd505db42eebd2 305327: f9ae7589cd10f910fc649a3decdd02a493c3df32 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 55e1787483b5..fe7955f9929f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76ef6a25ce2a1fbb9a51c553c93d2ad74f0f9185 +refs/heads/master: d14299dec74a094b0f26b0893eccf8aefdfbd007 diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S index f8a7a1a1a9f4..e212c2f57fd8 100644 --- a/trunk/arch/powerpc/kernel/entry_64.S +++ b/trunk/arch/powerpc/kernel/entry_64.S @@ -154,7 +154,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) ld r10,TI_FLAGS(r11) andi. r11,r10,_TIF_SYSCALL_T_OR_A bne- syscall_dotrace -syscall_dotrace_cont: +.Lsyscall_dotrace_cont: cmpldi 0,r0,NR_syscalls bge- syscall_enosys @@ -211,7 +211,7 @@ syscall_exit: cmpld r3,r11 ld r5,_CCR(r1) bge- syscall_error -syscall_error_cont: +.Lsyscall_error_cont: ld r7,_NIP(r1) BEGIN_FTR_SECTION stdcx. r0,0,r1 /* to clear the reservation */ @@ -246,7 +246,7 @@ syscall_error: oris r5,r5,0x1000 /* Set SO bit in CR */ neg r3,r3 std r5,_CCR(r1) - b syscall_error_cont + b .Lsyscall_error_cont /* Traced system call support */ syscall_dotrace: @@ -268,7 +268,7 @@ syscall_dotrace: addi r9,r1,STACK_FRAME_OVERHEAD clrrdi r10,r1,THREAD_SHIFT ld r10,TI_FLAGS(r10) - b syscall_dotrace_cont + b .Lsyscall_dotrace_cont syscall_enosys: li r3,-ENOSYS