lkml.org 
[lkml]   [2018]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 2/5] m68k: rename UL() to TO_UL()
    Date
    ARM, ARM64 and UniCore32 define UL(x) like follows:
    #define UL(x) _AC(x, UL)

    While, M68K defines it differently:
    #define UL(x) ((unsigned long) (x))

    I want to move the former to a common header. Beforehand, this
    commit renames the latter to avoid name conflict.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    ---
    V2: https://patchwork.kernel.org/patch/9498273/

    Changes in v3: None
    Changes in v2:
    - Split out as a prerequisite patch

    arch/m68k/mm/init.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
    index e85acd1..583a8e5 100644
    --- a/arch/m68k/mm/init.c
    +++ b/arch/m68k/mm/init.c
    @@ -122,9 +122,9 @@ void free_initmem(void)

    void __init print_memmap(void)
    {
    -#define UL(x) ((unsigned long) (x))
    -#define MLK(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 10
    -#define MLM(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 20
    +#define TO_UL(x) ((unsigned long) (x))
    +#define MLK(b, t) TO_UL(b), TO_UL(t), (TO_UL(t) - TO_UL(b)) >> 10
    +#define MLM(b, t) TO_UL(b), TO_UL(t), (TO_UL(t) - TO_UL(b)) >> 20
    #define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), 1024)

    pr_notice("Virtual kernel memory layout:\n"
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-02-22 13:18    [W:2.964 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site