lkml.org 
[lkml]   [2008]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 27/39] move __addr_ok to uaccess.h
    Date
    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>
    ---
    include/asm-x86/uaccess.h | 4 ++++
    include/asm-x86/uaccess_32.h | 4 ----
    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 a06a810..3721513 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);
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-06-27 23:51    [W:0.028 / U:121.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site