Module: xenomai-3 Branch: next Commit: 7594a861e560581b444911790f65aff91f82b628 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=7594a861e560581b444911790f65aff91f82b628
Author: Philippe Gerum <[email protected]> Date: Wed Sep 16 12:02:17 2015 +0200 cobalt/kernel/posix: hide syscall handlers from the common namespace cobalt_* should be reserved for the Cobalt implementation. Use a different prefix for Cobalt syscall handlers. --- kernel/cobalt/arch/x86/include/asm/xenomai/syscall32.h | 12 ++++++------ kernel/cobalt/posix/syscall.c | 4 ++-- kernel/cobalt/posix/syscall.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/cobalt/arch/x86/include/asm/xenomai/syscall32.h b/kernel/cobalt/arch/x86/include/asm/xenomai/syscall32.h index 58b7336..4fc1be8 100644 --- a/kernel/cobalt/arch/x86/include/asm/xenomai/syscall32.h +++ b/kernel/cobalt/arch/x86/include/asm/xenomai/syscall32.h @@ -42,7 +42,7 @@ #error "__NR_COBALT_SYSCALLS > __COBALT_X32_BASE" #endif -#define __syshand32x__(__name) ((cobalt_syshand)(cobalt32x_ ## __name)) +#define __syshand32x__(__name) ((cobalt_syshand)(CoBaLt32x_ ## __name)) #define __COBALT_CALL32x_INITHAND(__handler) \ [__COBALT_X32_BASE ... __COBALT_X32_BASE + __NR_COBALT_SYSCALLS-1] = __handler, @@ -63,11 +63,11 @@ /* x32 thunk implementation. */ #define COBALT_SYSCALL32x(__name, __mode, __args) \ - long cobalt32x_ ## __name __args + long CoBaLt32x_ ## __name __args /* x32 thunk declaration. */ #define COBALT_SYSCALL32x_DECL(__name, __args) \ - long cobalt32x_ ## __name __args + long CoBaLt32x_ ## __name __args #else /* !CONFIG_X86_X32 */ @@ -110,7 +110,7 @@ #error "__NR_COBALT_SYSCALLS > __COBALT_IA32_BASE" #endif -#define __syshand32emu__(__name) ((cobalt_syshand)(cobalt32emu_ ## __name)) +#define __syshand32emu__(__name) ((cobalt_syshand)(CoBaLt32emu_ ## __name)) #define __COBALT_CALL32emu_INITHAND(__handler) \ [__COBALT_IA32_BASE ... __COBALT_IA32_BASE + __NR_COBALT_SYSCALLS-1] = __handler, @@ -128,11 +128,11 @@ /* ia32 thunk implementation. */ #define COBALT_SYSCALL32emu(__name, __mode, __args) \ - long cobalt32emu_ ## __name __args + long CoBaLt32emu_ ## __name __args /* ia32 thunk declaration. */ #define COBALT_SYSCALL32emu_DECL(__name, __args) \ - long cobalt32emu_ ## __name __args + long CoBaLt32emu_ ## __name __args #else /* !CONFIG_IA32_EMULATION */ diff --git a/kernel/cobalt/posix/syscall.c b/kernel/cobalt/posix/syscall.c index a128dea..7f2e1c6 100644 --- a/kernel/cobalt/posix/syscall.c +++ b/kernel/cobalt/posix/syscall.c @@ -520,7 +520,7 @@ static COBALT_SYSCALL(corectl, probing, return ret; } -static int cobalt_ni(void) +static int CoBaLt_ni(void) { return -ENOSYS; } @@ -585,7 +585,7 @@ static int cobalt_ni(void) * * --rpm */ -#define __syshand__(__name) ((cobalt_syshand)(cobalt_ ## __name)) +#define __syshand__(__name) ((cobalt_syshand)(CoBaLt_ ## __name)) #define __COBALT_NI __syshand__(ni) diff --git a/kernel/cobalt/posix/syscall.h b/kernel/cobalt/posix/syscall.h index d2b4442..690cb22 100644 --- a/kernel/cobalt/posix/syscall.h +++ b/kernel/cobalt/posix/syscall.h @@ -22,11 +22,11 @@ /* Regular (native) syscall handler implementation. */ #define COBALT_SYSCALL(__name, __mode, __args) \ - long cobalt_ ## __name __args + long CoBaLt_ ## __name __args /* Regular (native) syscall handler declaration. */ #define COBALT_SYSCALL_DECL(__name, __args) \ - long cobalt_ ## __name __args + long CoBaLt_ ## __name __args #include <asm/xenomai/syscall32.h> _______________________________________________ Xenomai-git mailing list [email protected] http://xenomai.org/mailman/listinfo/xenomai-git
