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

Commit 64be6d36 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by H. Peter Anvin
Browse files

x86, asm: Use CC_SET()/CC_OUT() in <asm/percpu.h> 



Remove open-coded uses of set instructions to use CC_SET()/CC_OUT() in
<asm/percpu.h>.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1465414726-197858-8-git-send-email-hpa@linux.intel.com


Reviewed-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent 86b61240

arch/x86/include/asm/percpu.h

+5 −4
Original line number Diff line number Diff line
@@ -511,8 +511,9 @@ do { \ 
#define x86_test_and_clear_bit_percpu(bit, var)				\

({									\

	bool old__;							\

	asm volatile("btr %2,"__percpu_arg(1)"\n\tsetc %0"		\

		     : "=qm" (old__), "+m" (var)			\

	asm volatile("btr %2,"__percpu_arg(1)"\n\t"			\

		     CC_SET(c)						\

		     : CC_OUT(c) (old__), "+m" (var)			\

		     : "dIr" (bit));					\

	old__;								\

})
@@ -535,8 +536,8 @@ static inline bool x86_this_cpu_variable_test_bit(int nr, 
	bool oldbit;



	asm volatile("bt "__percpu_arg(2)",%1\n\t"

			"setc %0"

			: "=qm" (oldbit)

			CC_SET(c)

			: CC_OUT(c) (oldbit)

			: "m" (*(unsigned long *)addr), "Ir" (nr));



	return oldbit;