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

Commit 3c52b5c6 authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

x86/asm: Remove unnecessary \n\t in front of CC_SET() from asm templates 



There is no need for \n\t in front of CC_SET(), as the macro already includes these two.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170906151808.5634-1-ubizjak@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c65da8e2

arch/x86/include/asm/archrandom.h

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static inline bool rdrand_long(unsigned long *v) 
	bool ok;

	unsigned int retry = RDRAND_RETRY_LOOPS;

	do {

		asm volatile(RDRAND_LONG "\n\t"

		asm volatile(RDRAND_LONG

			     CC_SET(c)

			     : CC_OUT(c) (ok), "=a" (*v));

		if (ok)
@@ -59,7 +59,7 @@ static inline bool rdrand_int(unsigned int *v) 
	bool ok;

	unsigned int retry = RDRAND_RETRY_LOOPS;

	do {

		asm volatile(RDRAND_INT "\n\t"

		asm volatile(RDRAND_INT

			     CC_SET(c)

			     : CC_OUT(c) (ok), "=a" (*v));

		if (ok)
@@ -71,7 +71,7 @@ static inline bool rdrand_int(unsigned int *v) 
static inline bool rdseed_long(unsigned long *v)

{

	bool ok;

	asm volatile(RDSEED_LONG "\n\t"

	asm volatile(RDSEED_LONG

		     CC_SET(c)

		     : CC_OUT(c) (ok), "=a" (*v));

	return ok;
@@ -80,7 +80,7 @@ static inline bool rdseed_long(unsigned long *v) 
static inline bool rdseed_int(unsigned int *v)

{

	bool ok;

	asm volatile(RDSEED_INT "\n\t"

	asm volatile(RDSEED_INT

		     CC_SET(c)

		     : CC_OUT(c) (ok), "=a" (*v));

	return ok;

arch/x86/include/asm/bitops.h

+5 −5
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static __always_inline void __clear_bit(long nr, volatile unsigned long *addr) 
static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)

{

	bool negative;

	asm volatile(LOCK_PREFIX "andb %2,%1\n\t"

	asm volatile(LOCK_PREFIX "andb %2,%1"

		CC_SET(s)

		: CC_OUT(s) (negative), ADDR

		: "ir" ((char) ~(1 << nr)) : "memory");
@@ -245,7 +245,7 @@ static __always_inline bool __test_and_set_bit(long nr, volatile unsigned long * 
{

	bool oldbit;



	asm("bts %2,%1\n\t"

	asm("bts %2,%1"

	    CC_SET(c)

	    : CC_OUT(c) (oldbit), ADDR

	    : "Ir" (nr));
@@ -285,7 +285,7 @@ static __always_inline bool __test_and_clear_bit(long nr, volatile unsigned long 
{

	bool oldbit;



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

	asm volatile("btr %2,%1"

		     CC_SET(c)

		     : CC_OUT(c) (oldbit), ADDR

		     : "Ir" (nr));
@@ -297,7 +297,7 @@ static __always_inline bool __test_and_change_bit(long nr, volatile unsigned lon 
{

	bool oldbit;



	asm volatile("btc %2,%1\n\t"

	asm volatile("btc %2,%1"

		     CC_SET(c)

		     : CC_OUT(c) (oldbit), ADDR

		     : "Ir" (nr) : "memory");
@@ -328,7 +328,7 @@ static __always_inline bool variable_test_bit(long nr, volatile const unsigned l 
{

	bool oldbit;



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

	asm volatile("bt %2,%1"

		     CC_SET(c)

		     : CC_OUT(c) (oldbit)

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

arch/x86/include/asm/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static inline bool x86_this_cpu_variable_test_bit(int nr, 
{

	bool oldbit;



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

	asm volatile("bt "__percpu_arg(2)",%1"

			CC_SET(c)

			: CC_OUT(c) (oldbit)

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

arch/x86/include/asm/rmwcc.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_label: \ 
#define __GEN_RMWcc(fullop, var, cc, clobbers, ...)			\

do {									\

	bool c;								\

	asm volatile (fullop ";" CC_SET(cc)				\

	asm volatile (fullop CC_SET(cc)					\

			: [counter] "+m" (var), CC_OUT(cc) (c)		\

			: __VA_ARGS__ : clobbers);			\

	return c;							\