lkml.org 
[lkml]   [2010]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 22/37] move round_up/down to kernel.h
    prepare to early_res moving up

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/include/asm/proto.h | 10 ----------
    include/linux/kernel.h | 10 ++++++++++
    2 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h
    index 4009f65..6f414ed 100644
    --- a/arch/x86/include/asm/proto.h
    +++ b/arch/x86/include/asm/proto.h
    @@ -23,14 +23,4 @@ extern int reboot_force;

    long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);

    -/*
    - * This looks more complex than it should be. But we need to
    - * get the type for the ~ right in round_down (it needs to be
    - * as wide as the result!), and we want to evaluate the macro
    - * arguments just once each.
    - */
    -#define __round_mask(x,y) ((__typeof__(x))((y)-1))
    -#define round_up(x,y) ((((x)-1) | __round_mask(x,y))+1)
    -#define round_down(x,y) ((x) & ~__round_mask(x,y))
    -
    #endif /* _ASM_X86_PROTO_H */
    diff --git a/include/linux/kernel.h b/include/linux/kernel.h
    index 785d7d1..9e1e9ef 100644
    --- a/include/linux/kernel.h
    +++ b/include/linux/kernel.h
    @@ -44,6 +44,16 @@ extern const char linux_proc_banner[];

    #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))

    +/*
    + * This looks more complex than it should be. But we need to
    + * get the type for the ~ right in round_down (it needs to be
    + * as wide as the result!), and we want to evaluate the macro
    + * arguments just once each.
    + */
    +#define __round_mask(x,y) ((__typeof__(x))((y)-1))
    +#define round_up(x,y) ((((x)-1) | __round_mask(x,y))+1)
    +#define round_down(x,y) ((x) & ~__round_mask(x,y))
    +
    #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
    #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
    #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-01-16 04:17    [W:0.023 / U:60.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site