Commit 9a72f9d6 authored by Jens Axboe's avatar Jens Axboe

[PATCH] Fix x86-64 build

parent 35f82b30
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
# #
obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_ioctl.o \ 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 ia32_binfmt.o fpu32.o ptrace32.o ipc32.o syscall32.o
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define access_ok(type,addr,size) (__range_not_ok(addr,size) == 0) #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; 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) ...@@ -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_to_user(void *to, const void *from, unsigned len);
extern unsigned long copy_from_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)) if (!__builtin_constant_p(size))
return copy_user_generic(dst,src,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 ...@@ -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)) if (!__builtin_constant_p(size))
return copy_user_generic(dst,src,size); return copy_user_generic(dst,src,size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment