Messages in this thread Patch in this message | | | Date | Thu, 22 Jan 2009 16:29:06 +0100 | From | Roel Kluin <> | Subject | [PATCH] x86, um: fix EXECUTE_SYSCALL macros |
| |
Roel Kluin wrote: > When these macros aren't called with regs, e.g. with foo > this will incorectly expand to foo->foo.gp[*] > > Signed-off-by: Roel Kluin <roel.kluin@gmail.com> > --- > My other patch should probably as well have been sent to this list: > http://lkml.org/lkml/2009/1/21/203 > there were more
Fix EXECUTE_SYSCALL macros. When called with a variable named other than regs as second argument, this will result in a build failure.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> --- diff --git a/arch/um/sys-i386/shared/sysdep/syscalls.h b/arch/um/sys-i386/shared/sysdep/syscalls.h index 9056981..1cab192 100644 --- a/arch/um/sys-i386/shared/sysdep/syscalls.h +++ b/arch/um/sys-i386/shared/sysdep/syscalls.h @@ -17,9 +17,9 @@ extern syscall_handler_t old_mmap_i386; extern syscall_handler_t *sys_call_table[]; -#define EXECUTE_SYSCALL(syscall, regs) \ +#define EXECUTE_SYSCALL(syscall, _regs) \ ((long (*)(struct syscall_args)) \ - (*sys_call_table[syscall]))(SYSCALL_ARGS(®s->regs)) + (*sys_call_table[syscall]))(SYSCALL_ARGS(&_regs->regs)) extern long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, diff --git a/arch/um/sys-x86_64/shared/sysdep/syscalls.h b/arch/um/sys-x86_64/shared/sysdep/syscalls.h index 7cfb0b0..a5be219 100644 --- a/arch/um/sys-x86_64/shared/sysdep/syscalls.h +++ b/arch/um/sys-x86_64/shared/sysdep/syscalls.h @@ -15,14 +15,14 @@ typedef long syscall_handler_t(void); extern syscall_handler_t *sys_call_table[]; -#define EXECUTE_SYSCALL(syscall, regs) \ +#define EXECUTE_SYSCALL(syscall, _regs) \ (((long (*)(long, long, long, long, long, long)) \ - (*sys_call_table[syscall]))(UPT_SYSCALL_ARG1(®s->regs), \ - UPT_SYSCALL_ARG2(®s->regs), \ - UPT_SYSCALL_ARG3(®s->regs), \ - UPT_SYSCALL_ARG4(®s->regs), \ - UPT_SYSCALL_ARG5(®s->regs), \ - UPT_SYSCALL_ARG6(®s->regs))) + (*sys_call_table[syscall]))(UPT_SYSCALL_ARG1(&_regs->regs), \ + UPT_SYSCALL_ARG2(&_regs->regs), \ + UPT_SYSCALL_ARG3(&_regs->regs), \ + UPT_SYSCALL_ARG4(&_regs->regs), \ + UPT_SYSCALL_ARG5(&_regs->regs), \ + UPT_SYSCALL_ARG6(&_regs->regs))) extern long old_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
| |