lkml.org 
[lkml]   [2018]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 033/104] x86, asm: Extend definitions of _ASM_* with a raw format
    3.2.101-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jan-Simon Möller <dl9pf@gmx.de>

    commit 3e9b2327b59801e677a7581fe4d2541ca749dcab upstream.

    The __ASM_* macros (e.g. __ASM_DX) are used to return the proper
    register name (e.g. edx for 32bit / rdx for 64bit). We want to use
    this also in arch/x86/include/asm/uaccess.h / get_user() . For this
    to work, we need a raw form as both gcc and clang choke on the
    whitespace in a register asm() statement, and the __ASM_FORM macro
    surrounds the argument with blanks. A new macro, __ASM_FORM_RAW was
    added and we change __ASM_REG to use the new RAW form.

    Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
    Link: http://lkml.kernel.org/r/1377803585-5913-2-git-send-email-dl9pf@gmx.de
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/include/asm/asm.h | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/arch/x86/include/asm/asm.h
    +++ b/arch/x86/include/asm/asm.h
    @@ -3,23 +3,27 @@

    #ifdef __ASSEMBLY__
    # define __ASM_FORM(x) x
    +# define __ASM_FORM_RAW(x) x
    # define __ASM_FORM_COMMA(x) x,
    # define __ASM_EX_SEC .section __ex_table, "a"
    #else
    # define __ASM_FORM(x) " " #x " "
    +# define __ASM_FORM_RAW(x) #x
    # define __ASM_FORM_COMMA(x) " " #x ","
    # define __ASM_EX_SEC " .section __ex_table,\"a\"\n"
    #endif

    #ifdef CONFIG_X86_32
    # define __ASM_SEL(a,b) __ASM_FORM(a)
    +# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)
    #else
    # define __ASM_SEL(a,b) __ASM_FORM(b)
    +# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)
    #endif

    #define __ASM_SIZE(inst, ...) __ASM_SEL(inst##l##__VA_ARGS__, \
    inst##q##__VA_ARGS__)
    -#define __ASM_REG(reg) __ASM_SEL(e##reg, r##reg)
    +#define __ASM_REG(reg) __ASM_SEL_RAW(e##reg, r##reg)

    #define _ASM_PTR __ASM_SEL(.long, .quad)
    #define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8)
    \
     
     \ /
      Last update: 2018-03-12 04:28    [W:2.432 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site