tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Anton Blanchard <anton@samba.org>

Anton Blanchard c1fb0194 35425501

+25 -23
+2
arch/powerpc/include/asm/ppc_asm.h
··· 223 223 .type GLUE(.,name),@function; \ 224 224 GLUE(.,name): 225 225 226 + #define DOTSYM(a) GLUE(.,a) 227 + 226 228 #else /* 32-bit */ 227 229 228 230 #define _ENTRY(n) \
+3 -3
arch/powerpc/include/asm/systbl.h
··· 62 62 SYSCALL(ni_syscall) 63 63 SYSCALL_SPU(setpgid) 64 64 SYSCALL(ni_syscall) 65 - SYSX(sys_ni_syscall,sys_olduname, sys_olduname) 65 + SYSX(sys_ni_syscall,sys_olduname,sys_olduname) 66 66 SYSCALL_SPU(umask) 67 67 SYSCALL_SPU(chroot) 68 68 COMPAT_SYS(ustat) ··· 258 258 COMPAT_SYS_SPU(utimes) 259 259 COMPAT_SYS_SPU(statfs64) 260 260 COMPAT_SYS_SPU(fstatfs64) 261 - SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64) 261 + SYSX(sys_ni_syscall,ppc_fadvise64_64,ppc_fadvise64_64) 262 262 PPC_SYS_SPU(rtas) 263 263 OLDSYS(debug_setcontext) 264 264 SYSCALL(ni_syscall) ··· 295 295 SYSCALL_SPU(mknodat) 296 296 SYSCALL_SPU(fchownat) 297 297 COMPAT_SYS_SPU(futimesat) 298 - SYSX_SPU(sys_newfstatat, sys_fstatat64, sys_fstatat64) 298 + SYSX_SPU(sys_newfstatat,sys_fstatat64,sys_fstatat64) 299 299 SYSCALL_SPU(unlinkat) 300 300 SYSCALL_SPU(renameat) 301 301 SYSCALL_SPU(linkat)
+6 -6
arch/powerpc/kernel/systbl.S
··· 17 17 #include <asm/ppc_asm.h> 18 18 19 19 #ifdef CONFIG_PPC64 20 - #define SYSCALL(func) .llong .sys_##func,.sys_##func 21 - #define COMPAT_SYS(func) .llong .sys_##func,.compat_sys_##func 22 - #define PPC_SYS(func) .llong .ppc_##func,.ppc_##func 23 - #define OLDSYS(func) .llong .sys_ni_syscall,.sys_ni_syscall 24 - #define SYS32ONLY(func) .llong .sys_ni_syscall,.compat_sys_##func 25 - #define SYSX(f, f3264, f32) .llong .f,.f3264 20 + #define SYSCALL(func) .llong DOTSYM(sys_##func),DOTSYM(sys_##func) 21 + #define COMPAT_SYS(func) .llong DOTSYM(sys_##func),DOTSYM(compat_sys_##func) 22 + #define PPC_SYS(func) .llong DOTSYM(ppc_##func),DOTSYM(ppc_##func) 23 + #define OLDSYS(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(sys_ni_syscall) 24 + #define SYS32ONLY(func) .llong DOTSYM(sys_ni_syscall),DOTSYM(compat_sys_##func) 25 + #define SYSX(f, f3264, f32) .llong DOTSYM(f),DOTSYM(f3264) 26 26 #else 27 27 #define SYSCALL(func) .long sys_##func 28 28 #define COMPAT_SYS(func) .long sys_##func
+14 -14
arch/powerpc/kvm/book3s_hv_rmhandlers.S
··· 1795 1795 .globl hcall_real_table 1796 1796 hcall_real_table: 1797 1797 .long 0 /* 0 - unused */ 1798 - .long .kvmppc_h_remove - hcall_real_table 1799 - .long .kvmppc_h_enter - hcall_real_table 1800 - .long .kvmppc_h_read - hcall_real_table 1798 + .long DOTSYM(kvmppc_h_remove) - hcall_real_table 1799 + .long DOTSYM(kvmppc_h_enter) - hcall_real_table 1800 + .long DOTSYM(kvmppc_h_read) - hcall_real_table 1801 1801 .long 0 /* 0x10 - H_CLEAR_MOD */ 1802 1802 .long 0 /* 0x14 - H_CLEAR_REF */ 1803 - .long .kvmppc_h_protect - hcall_real_table 1804 - .long .kvmppc_h_get_tce - hcall_real_table 1805 - .long .kvmppc_h_put_tce - hcall_real_table 1803 + .long DOTSYM(kvmppc_h_protect) - hcall_real_table 1804 + .long DOTSYM(kvmppc_h_get_tce) - hcall_real_table 1805 + .long DOTSYM(kvmppc_h_put_tce) - hcall_real_table 1806 1806 .long 0 /* 0x24 - H_SET_SPRG0 */ 1807 - .long .kvmppc_h_set_dabr - hcall_real_table 1807 + .long DOTSYM(kvmppc_h_set_dabr) - hcall_real_table 1808 1808 .long 0 /* 0x2c */ 1809 1809 .long 0 /* 0x30 */ 1810 1810 .long 0 /* 0x34 */ ··· 1820 1820 .long 0 /* 0x5c */ 1821 1821 .long 0 /* 0x60 */ 1822 1822 #ifdef CONFIG_KVM_XICS 1823 - .long .kvmppc_rm_h_eoi - hcall_real_table 1824 - .long .kvmppc_rm_h_cppr - hcall_real_table 1825 - .long .kvmppc_rm_h_ipi - hcall_real_table 1823 + .long DOTSYM(kvmppc_rm_h_eoi) - hcall_real_table 1824 + .long DOTSYM(kvmppc_rm_h_cppr) - hcall_real_table 1825 + .long DOTSYM(kvmppc_rm_h_ipi) - hcall_real_table 1826 1826 .long 0 /* 0x70 - H_IPOLL */ 1827 - .long .kvmppc_rm_h_xirr - hcall_real_table 1827 + .long DOTSYM(kvmppc_rm_h_xirr) - hcall_real_table 1828 1828 #else 1829 1829 .long 0 /* 0x64 - H_EOI */ 1830 1830 .long 0 /* 0x68 - H_CPPR */ ··· 1858 1858 .long 0 /* 0xd4 */ 1859 1859 .long 0 /* 0xd8 */ 1860 1860 .long 0 /* 0xdc */ 1861 - .long .kvmppc_h_cede - hcall_real_table 1861 + .long DOTSYM(kvmppc_h_cede) - hcall_real_table 1862 1862 .long 0 /* 0xe4 */ 1863 1863 .long 0 /* 0xe8 */ 1864 1864 .long 0 /* 0xec */ ··· 1875 1875 .long 0 /* 0x118 */ 1876 1876 .long 0 /* 0x11c */ 1877 1877 .long 0 /* 0x120 */ 1878 - .long .kvmppc_h_bulk_remove - hcall_real_table 1878 + .long DOTSYM(kvmppc_h_bulk_remove) - hcall_real_table 1879 1879 .long 0 /* 0x128 */ 1880 1880 .long 0 /* 0x12c */ 1881 1881 .long 0 /* 0x130 */ 1882 - .long .kvmppc_h_set_xdabr - hcall_real_table 1882 + .long DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table 1883 1883 hcall_real_table_end: 1884 1884 1885 1885 ignore_hdec: