As per Andi's wishes, here is the x86_64 part of the patch. This one will
only apply after applying my previous patch "[PATCH][COMPAT] outstanding
compatibility changes 4/4 x86_64".
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/diff -ruN 2.5.60-32bit.1/arch/x86_64/ia32/ia32entry.S 2.5.60-32bit.2/arch/x86_64/ia32/ia32entry.S --- 2.5.60-32bit.1/arch/x86_64/ia32/ia32entry.S 2003-02-11 12:21:29.000000000 +1100 +++ 2.5.60-32bit.2/arch/x86_64/ia32/ia32entry.S 2003-02-11 12:21:56.000000000 +1100 @@ -440,7 +440,7 @@ .quad sys_fremovexattr .quad sys_tkill /* 238 */ .quad sys_sendfile64 - .quad sys32_futex /* 240 */ + .quad compay_sys_futex /* 240 */ .quad sys32_sched_setaffinity .quad sys32_sched_getaffinity .quad sys_set_thread_area diff -ruN 2.5.60-32bit.1/arch/x86_64/ia32/sys_ia32.c 2.5.60-32bit.2/arch/x86_64/ia32/sys_ia32.c --- 2.5.60-32bit.1/arch/x86_64/ia32/sys_ia32.c 2003-02-11 12:21:29.000000000 +1100 +++ 2.5.60-32bit.2/arch/x86_64/ia32/sys_ia32.c 2003-02-11 12:21:56.000000000 +1100 @@ -2199,26 +2199,6 @@ return err; } -extern int sys_futex(unsigned long uaddr, int op, int val, struct timespec *t); - -asmlinkage long -sys32_futex(unsigned long uaddr, int op, int val, struct compat_timespec *utime32) -{ - struct timespec t; - mm_segment_t oldfs = get_fs(); - int err; - - if (utime32 && get_compat_timespec(&t, utime32)) - return -EFAULT; - - /* the set_fs is safe because futex doesn't use the seg limit - for valid page checking of uaddr. */ - set_fs(KERNEL_DS); - err = sys_futex(uaddr, op, val, utime32 ? &t : NULL); - set_fs(oldfs); - return err; -} - extern long sys_io_setup(unsigned nr_reqs, aio_context_t *ctx); long sys32_io_setup(unsigned nr_reqs, u32 *ctx32p) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/