From 9a72f9d6110a891d4e797a63119edf6210b21bda Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 10 Mar 2003 18:55:02 -0800 Subject: [PATCH] [PATCH] Fix x86-64 build --- arch/x86_64/ia32/Makefile | 2 +- include/asm-x86_64/uaccess.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile index 66802f3d22c5b..55734381452dc 100644 --- a/arch/x86_64/ia32/Makefile +++ b/arch/x86_64/ia32/Makefile @@ -3,5 +3,5 @@ # obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_ioctl.o \ - ia32_signal.o \ + ia32_signal.o tls32.o \ ia32_binfmt.o fpu32.o ptrace32.o ipc32.o syscall32.o diff --git a/include/asm-x86_64/uaccess.h b/include/asm-x86_64/uaccess.h index 21fd76c66f8f2..6593ed6509d00 100644 --- a/include/asm-x86_64/uaccess.h +++ b/include/asm-x86_64/uaccess.h @@ -48,7 +48,7 @@ #define access_ok(type,addr,size) (__range_not_ok(addr,size) == 0) -extern __force_inline int verify_area(int type, const void * addr, unsigned long size) +extern inline int verify_area(int type, const void * addr, unsigned long size) { return access_ok(type,addr,size) ? 0 : -EFAULT; } @@ -238,7 +238,7 @@ extern unsigned long copy_user_generic(void *to, const void *from, unsigned len) extern unsigned long copy_to_user(void *to, const void *from, unsigned len); extern unsigned long copy_from_user(void *to, const void *from, unsigned len); -static __force_inline int __copy_from_user(void *dst, const void *src, unsigned size) +static inline int __copy_from_user(void *dst, const void *src, unsigned size) { if (!__builtin_constant_p(size)) return copy_user_generic(dst,src,size); @@ -267,7 +267,7 @@ static __force_inline int __copy_from_user(void *dst, const void *src, unsigned } } -static __force_inline int __copy_to_user(void *dst, const void *src, unsigned size) +static inline int __copy_to_user(void *dst, const void *src, unsigned size) { if (!__builtin_constant_p(size)) return copy_user_generic(dst,src,size); -- 2.53.0