lkml.org 
[lkml]   [2018]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    From
    Subject[PATCH 03/35] x86: Reindent _static_cpu_has
    Because its daft..

    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/x86/include/asm/cpufeature.h | 78 +++++++++++++++++++-------------------
    1 file changed, 39 insertions(+), 39 deletions(-)

    --- a/arch/x86/include/asm/cpufeature.h
    +++ b/arch/x86/include/asm/cpufeature.h
    @@ -145,45 +145,45 @@ extern void clear_cpu_cap(struct cpuinfo
    */
    static __always_inline __pure bool _static_cpu_has(u16 bit)
    {
    - asm_volatile_goto("1: jmp 6f\n"
    - "2:\n"
    - ".skip -(((5f-4f) - (2b-1b)) > 0) * "
    - "((5f-4f) - (2b-1b)),0x90\n"
    - "3:\n"
    - ".section .altinstructions,\"a\"\n"
    - " .long 1b - .\n" /* src offset */
    - " .long 4f - .\n" /* repl offset */
    - " .word %P1\n" /* always replace */
    - " .byte 3b - 1b\n" /* src len */
    - " .byte 5f - 4f\n" /* repl len */
    - " .byte 3b - 2b\n" /* pad len */
    - ".previous\n"
    - ".section .altinstr_replacement,\"ax\"\n"
    - "4: jmp %l[t_no]\n"
    - "5:\n"
    - ".previous\n"
    - ".section .altinstructions,\"a\"\n"
    - " .long 1b - .\n" /* src offset */
    - " .long 0\n" /* no replacement */
    - " .word %P0\n" /* feature bit */
    - " .byte 3b - 1b\n" /* src len */
    - " .byte 0\n" /* repl len */
    - " .byte 0\n" /* pad len */
    - ".previous\n"
    - ".section .altinstr_aux,\"ax\"\n"
    - "6:\n"
    - " testb %[bitnum],%[cap_byte]\n"
    - " jnz %l[t_yes]\n"
    - " jmp %l[t_no]\n"
    - ".previous\n"
    - : : "i" (bit), "i" (X86_FEATURE_ALWAYS),
    - [bitnum] "i" (1 << (bit & 7)),
    - [cap_byte] "m" (((const char *)boot_cpu_data.x86_capability)[bit >> 3])
    - : : t_yes, t_no);
    - t_yes:
    - return true;
    - t_no:
    - return false;
    + asm_volatile_goto("1: jmp 6f\n"
    + "2:\n"
    + ".skip -(((5f-4f) - (2b-1b)) > 0) * "
    + "((5f-4f) - (2b-1b)),0x90\n"
    + "3:\n"
    + ".section .altinstructions,\"a\"\n"
    + " .long 1b - .\n" /* src offset */
    + " .long 4f - .\n" /* repl offset */
    + " .word %P1\n" /* always replace */
    + " .byte 3b - 1b\n" /* src len */
    + " .byte 5f - 4f\n" /* repl len */
    + " .byte 3b - 2b\n" /* pad len */
    + ".previous\n"
    + ".section .altinstr_replacement,\"ax\"\n"
    + "4: jmp %l[t_no]\n"
    + "5:\n"
    + ".previous\n"
    + ".section .altinstructions,\"a\"\n"
    + " .long 1b - .\n" /* src offset */
    + " .long 0\n" /* no replacement */
    + " .word %P0\n" /* feature bit */
    + " .byte 3b - 1b\n" /* src len */
    + " .byte 0\n" /* repl len */
    + " .byte 0\n" /* pad len */
    + ".previous\n"
    + ".section .altinstr_aux,\"ax\"\n"
    + "6:\n"
    + " testb %[bitnum],%[cap_byte]\n"
    + " jnz %l[t_yes]\n"
    + " jmp %l[t_no]\n"
    + ".previous\n"
    + : : "i" (bit), "i" (X86_FEATURE_ALWAYS),
    + [bitnum] "i" (1 << (bit & 7)),
    + [cap_byte] "m" (((const char *)boot_cpu_data.x86_capability)[bit >> 3])
    + : : t_yes, t_no);
    +t_yes:
    + return true;
    +t_no:
    + return false;
    }

    #define static_cpu_has(bit) \

    \
     
     \ /
      Last update: 2018-01-18 16:05    [W:4.257 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site