Commit c1fb0194 authored by Anton Blanchard's avatar Anton Blanchard

powerpc: Create DOTSYM to wrap dot symbol usage

There are a few places we have to use dot symbols with the
current ABI - the syscall table and the kvm hcall table.

Wrap both of these with a new macro called DOTSYM so it will
be easy to transition away from dot symbols in a future ABI.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
parent 35425501
...@@ -223,6 +223,8 @@ name: \ ...@@ -223,6 +223,8 @@ name: \
.type GLUE(.,name),@function; \ .type GLUE(.,name),@function; \
GLUE(.,name): GLUE(.,name):
#define DOTSYM(a) GLUE(.,a)
#else /* 32-bit */ #else /* 32-bit */
#define _ENTRY(n) \ #define _ENTRY(n) \
......
...@@ -62,7 +62,7 @@ COMPAT_SYS_SPU(fcntl) ...@@ -62,7 +62,7 @@ COMPAT_SYS_SPU(fcntl)
SYSCALL(ni_syscall) SYSCALL(ni_syscall)
SYSCALL_SPU(setpgid) SYSCALL_SPU(setpgid)
SYSCALL(ni_syscall) SYSCALL(ni_syscall)
SYSX(sys_ni_syscall,sys_olduname, sys_olduname) SYSX(sys_ni_syscall,sys_olduname,sys_olduname)
SYSCALL_SPU(umask) SYSCALL_SPU(umask)
SYSCALL_SPU(chroot) SYSCALL_SPU(chroot)
COMPAT_SYS(ustat) COMPAT_SYS(ustat)
...@@ -258,7 +258,7 @@ SYSCALL_SPU(tgkill) ...@@ -258,7 +258,7 @@ SYSCALL_SPU(tgkill)
COMPAT_SYS_SPU(utimes) COMPAT_SYS_SPU(utimes)
COMPAT_SYS_SPU(statfs64) COMPAT_SYS_SPU(statfs64)
COMPAT_SYS_SPU(fstatfs64) COMPAT_SYS_SPU(fstatfs64)
SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64) SYSX(sys_ni_syscall,ppc_fadvise64_64,ppc_fadvise64_64)
PPC_SYS_SPU(rtas) PPC_SYS_SPU(rtas)
OLDSYS(debug_setcontext) OLDSYS(debug_setcontext)
SYSCALL(ni_syscall) SYSCALL(ni_syscall)
...@@ -295,7 +295,7 @@ SYSCALL_SPU(mkdirat) ...@@ -295,7 +295,7 @@ SYSCALL_SPU(mkdirat)
SYSCALL_SPU(mknodat) SYSCALL_SPU(mknodat)
SYSCALL_SPU(fchownat) SYSCALL_SPU(fchownat)
COMPAT_SYS_SPU(futimesat) COMPAT_SYS_SPU(futimesat)
SYSX_SPU(sys_newfstatat, sys_fstatat64, sys_fstatat64) SYSX_SPU(sys_newfstatat,sys_fstatat64,sys_fstatat64)
SYSCALL_SPU(unlinkat) SYSCALL_SPU(unlinkat)
SYSCALL_SPU(renameat) SYSCALL_SPU(renameat)
SYSCALL_SPU(linkat) SYSCALL_SPU(linkat)
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#define SYSCALL(func) .llong .sys_##func,.sys_##func #define SYSCALL(func) .llong DOTSYM(sys_##func),DOTSYM(sys_##func)
#define COMPAT_SYS(func) .llong .sys_##func,.compat_sys_##func #define COMPAT_SYS(func) .llong DOTSYM(sys_##func),DOTSYM(compat_sys_##func)
#define PPC_SYS(func) .llong .ppc_##func,.ppc_##func #define PPC_SYS(func) .llong DOTSYM(ppc_##func),DOTSYM(ppc_##func)
#define OLDSYS(func) .llong .sys_ni_syscall,.sys_ni_syscall #define OLDSYS(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(sys_ni_syscall)
#define SYS32ONLY(func) .llong .sys_ni_syscall,.compat_sys_##func #define SYS32ONLY(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(compat_sys_##func)
#define SYSX(f, f3264, f32) .llong .f,.f3264 #define SYSX(f, f3264, f32) .llong DOTSYM(f),DOTSYM(f3264)
#else #else
#define SYSCALL(func) .long sys_##func #define SYSCALL(func) .long sys_##func
#define COMPAT_SYS(func) .long sys_##func #define COMPAT_SYS(func) .long sys_##func
......
...@@ -1795,16 +1795,16 @@ hcall_real_fallback: ...@@ -1795,16 +1795,16 @@ hcall_real_fallback:
.globl hcall_real_table .globl hcall_real_table
hcall_real_table: hcall_real_table:
.long 0 /* 0 - unused */ .long 0 /* 0 - unused */
.long .kvmppc_h_remove - hcall_real_table .long DOTSYM(kvmppc_h_remove) - hcall_real_table
.long .kvmppc_h_enter - hcall_real_table .long DOTSYM(kvmppc_h_enter) - hcall_real_table
.long .kvmppc_h_read - hcall_real_table .long DOTSYM(kvmppc_h_read) - hcall_real_table
.long 0 /* 0x10 - H_CLEAR_MOD */ .long 0 /* 0x10 - H_CLEAR_MOD */
.long 0 /* 0x14 - H_CLEAR_REF */ .long 0 /* 0x14 - H_CLEAR_REF */
.long .kvmppc_h_protect - hcall_real_table .long DOTSYM(kvmppc_h_protect) - hcall_real_table
.long .kvmppc_h_get_tce - hcall_real_table .long DOTSYM(kvmppc_h_get_tce) - hcall_real_table
.long .kvmppc_h_put_tce - hcall_real_table .long DOTSYM(kvmppc_h_put_tce) - hcall_real_table
.long 0 /* 0x24 - H_SET_SPRG0 */ .long 0 /* 0x24 - H_SET_SPRG0 */
.long .kvmppc_h_set_dabr - hcall_real_table .long DOTSYM(kvmppc_h_set_dabr) - hcall_real_table
.long 0 /* 0x2c */ .long 0 /* 0x2c */
.long 0 /* 0x30 */ .long 0 /* 0x30 */
.long 0 /* 0x34 */ .long 0 /* 0x34 */
...@@ -1820,11 +1820,11 @@ hcall_real_table: ...@@ -1820,11 +1820,11 @@ hcall_real_table:
.long 0 /* 0x5c */ .long 0 /* 0x5c */
.long 0 /* 0x60 */ .long 0 /* 0x60 */
#ifdef CONFIG_KVM_XICS #ifdef CONFIG_KVM_XICS
.long .kvmppc_rm_h_eoi - hcall_real_table .long DOTSYM(kvmppc_rm_h_eoi) - hcall_real_table
.long .kvmppc_rm_h_cppr - hcall_real_table .long DOTSYM(kvmppc_rm_h_cppr) - hcall_real_table
.long .kvmppc_rm_h_ipi - hcall_real_table .long DOTSYM(kvmppc_rm_h_ipi) - hcall_real_table
.long 0 /* 0x70 - H_IPOLL */ .long 0 /* 0x70 - H_IPOLL */
.long .kvmppc_rm_h_xirr - hcall_real_table .long DOTSYM(kvmppc_rm_h_xirr) - hcall_real_table
#else #else
.long 0 /* 0x64 - H_EOI */ .long 0 /* 0x64 - H_EOI */
.long 0 /* 0x68 - H_CPPR */ .long 0 /* 0x68 - H_CPPR */
...@@ -1858,7 +1858,7 @@ hcall_real_table: ...@@ -1858,7 +1858,7 @@ hcall_real_table:
.long 0 /* 0xd4 */ .long 0 /* 0xd4 */
.long 0 /* 0xd8 */ .long 0 /* 0xd8 */
.long 0 /* 0xdc */ .long 0 /* 0xdc */
.long .kvmppc_h_cede - hcall_real_table .long DOTSYM(kvmppc_h_cede) - hcall_real_table
.long 0 /* 0xe4 */ .long 0 /* 0xe4 */
.long 0 /* 0xe8 */ .long 0 /* 0xe8 */
.long 0 /* 0xec */ .long 0 /* 0xec */
...@@ -1875,11 +1875,11 @@ hcall_real_table: ...@@ -1875,11 +1875,11 @@ hcall_real_table:
.long 0 /* 0x118 */ .long 0 /* 0x118 */
.long 0 /* 0x11c */ .long 0 /* 0x11c */
.long 0 /* 0x120 */ .long 0 /* 0x120 */
.long .kvmppc_h_bulk_remove - hcall_real_table .long DOTSYM(kvmppc_h_bulk_remove) - hcall_real_table
.long 0 /* 0x128 */ .long 0 /* 0x128 */
.long 0 /* 0x12c */ .long 0 /* 0x12c */
.long 0 /* 0x130 */ .long 0 /* 0x130 */
.long .kvmppc_h_set_xdabr - hcall_real_table .long DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table
hcall_real_table_end: hcall_real_table_end:
ignore_hdec: ignore_hdec:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment