From: Anton Blanchard Date: Tue, 26 May 2015 05:46:55 +0000 (+1000) Subject: powerpc: Non relocatable system call doesn't need a trampoline X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~6419^2~106 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d20be433e6a8892ecf59ef62636cd1333975347d;p=mirror_ubuntu-zesty-kernel.git powerpc: Non relocatable system call doesn't need a trampoline We need to use a trampoline when using LOAD_HANDLER(), because the destination needs to be in the first 64kB. An absolute branch has no such limitations, so just jump there. Signed-off-by: Anton Blanchard Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index cf8c1b55e6c8..0a0399c2af11 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -79,7 +79,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ mfspr r12,SPRN_SRR1 ; \ li r10,MSR_RI ; \ mtmsrd r10,1 ; /* Set RI (EE=0) */ \ - b system_call_entry ; + b system_call_common ; #endif /*