summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/linkage.h
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-02-04 16:07:20 +1100
committerAnton Blanchard <anton@samba.org>2014-04-23 10:05:20 +1000
commit7167af7cebedc7c2051184fef0e165aeb67d0b9d (patch)
tree27ce4c3220e6e21c8b323a95d1b45a3d8f25159a /arch/powerpc/include/asm/linkage.h
parentc1fb019477c27bfe309be282d178a08e56f05249 (diff)
downloadlinux-7167af7cebedc7c2051184fef0e165aeb67d0b9d.tar.gz
linux-7167af7cebedc7c2051184fef0e165aeb67d0b9d.tar.bz2
linux-7167af7cebedc7c2051184fef0e165aeb67d0b9d.zip
powerpc: Remove function descriptors and dot symbols on new ABI
ABIv2 doesn't have function descriptors or dot symbols. One new thing it does add is a function global and a local entry point, so add that to our _GLOBAL macro. Signed-off-by: Anton Blanchard <anton@samba.org>
Diffstat (limited to 'arch/powerpc/include/asm/linkage.h')
-rw-r--r--arch/powerpc/include/asm/linkage.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/asm/linkage.h
index b36f650a13ff..e3ad5c72724a 100644
--- a/arch/powerpc/include/asm/linkage.h
+++ b/arch/powerpc/include/asm/linkage.h
@@ -2,6 +2,7 @@
#define _ASM_POWERPC_LINKAGE_H
#ifdef CONFIG_PPC64
+#if !defined(_CALL_ELF) || _CALL_ELF != 2
#define cond_syscall(x) \
asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \
"\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
@@ -9,5 +10,6 @@
asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \
"\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
#endif
+#endif
#endif /* _ASM_POWERPC_LINKAGE_H */