Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3197b04b authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

x86/cpufeature: Update _static_cpu_has() to use all named variables 



Because more readable..

Requested-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5355ccbe

arch/x86/include/asm/cpufeature.h

+5 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit) 
		 ".section .altinstructions,\"a\"\n"

		 " .long 1b - .\n"		/* src offset */

		 " .long 4f - .\n"		/* repl offset */

		 " .word %P1\n"			/* always replace */

		 " .word %P[always]\n"		/* always replace */

		 " .byte 3b - 1b\n"		/* src len */

		 " .byte 5f - 4f\n"		/* repl len */

		 " .byte 3b - 2b\n"		/* pad len */
@@ -168,7 +168,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit) 
		 ".section .altinstructions,\"a\"\n"

		 " .long 1b - .\n"		/* src offset */

		 " .long 0\n"			/* no replacement */

		 " .word %P0\n"			/* feature bit */

		 " .word %P[feature]\n"		/* feature bit */

		 " .byte 3b - 1b\n"		/* src len */

		 " .byte 0\n"			/* repl len */

		 " .byte 0\n"			/* pad len */
@@ -179,7 +179,8 @@ static __always_inline __pure bool _static_cpu_has(u16 bit) 
		 " jnz %l[t_yes]\n"

		 " jmp %l[t_no]\n"

		 ".previous\n"

		 : : "i" (bit), "i" (X86_FEATURE_ALWAYS),

		 : : [feature]  "i" (bit),

		     [always]   "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);