diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-06-25 14:08:51 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 07:14:19 (GMT) |
| commit | 002ca1690c3d0a495e6aedd608281aeb01ce6385 (patch) | |
| tree | b44eacf9cb730b3a3f47e0f3848fac43f68af97e | |
| parent | 865e5b76505cdade261773bde32f785b3ce579f1 (diff) | |
| download | linux-002ca1690c3d0a495e6aedd608281aeb01ce6385.tar.xz | |
x86: move __addr_ok to uaccess.h.
Take it out of uaccess_32.h. Since it seems that no users
of the x86_64 exists, we simply pick the i386 version.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-x86/uaccess.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/uaccess_32.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/uaccess_64.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h index 8cb580c..8a1e45f 100644 --- a/include/asm-x86/uaccess.h +++ b/include/asm-x86/uaccess.h @@ -33,6 +33,10 @@ #define segment_eq(a, b) ((a).seg == (b).seg) +#define __addr_ok(addr) \ + ((unsigned long __force)(addr) < \ + (current_thread_info()->addr_limit.seg)) + /* * Test whether a block of memory is a valid user space address. * Returns 0 if the range is valid, nonzero otherwise. diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h index 3cc3236..87b1aed 100644 --- a/include/asm-x86/uaccess_32.h +++ b/include/asm-x86/uaccess_32.h @@ -20,10 +20,6 @@ extern struct movsl_mask { } ____cacheline_aligned_in_smp movsl_mask; #endif -#define __addr_ok(addr) \ - ((unsigned long __force)(addr) < \ - (current_thread_info()->addr_limit.seg)) - extern void __put_user_bad(void); /* diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h index 4a44b90..8130876 100644 --- a/include/asm-x86/uaccess_64.h +++ b/include/asm-x86/uaccess_64.h @@ -9,9 +9,6 @@ #include <linux/prefetch.h> #include <asm/page.h> -#define __addr_ok(addr) (!((unsigned long)(addr) & \ - (current_thread_info()->addr_limit.seg))) - #define ARCH_HAS_SEARCH_EXTABLE extern void __put_user_1(void); |