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

Commit aed3a4ed authored by Chen Gang's avatar Chen Gang Committed by Russell King
Browse files

ARM: 7868/1: arm/arm64: remove atomic_clear_mask() in "include/asm/atomic.h" 



In current kernel wide source code, except other architectures, only
s390 scsi drivers use atomic_clear_mask(), and arm/arm64 need not
support s390 drivers.

So remove atomic_clear_mask() from "arm[64]/include/asm/atomic.h".

Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4dcc1cf7

arch/arm/include/asm/atomic.h

+0 −24
Original line number Diff line number Diff line
@@ -135,21 +135,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 
	return oldval;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

{

	unsigned long tmp, tmp2;



	__asm__ __volatile__("@ atomic_clear_mask\n"

"1:	ldrex	%0, [%3]\n"

"	bic	%0, %0, %4\n"

"	strex	%1, %0, [%3]\n"

"	teq	%1, #0\n"

"	bne	1b"

	: "=&r" (tmp), "=&r" (tmp2), "+Qo" (*addr)

	: "r" (addr), "Ir" (mask)

	: "cc");

}



#else /* ARM_ARCH_6 */



#ifdef CONFIG_SMP
@@ -198,15 +183,6 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) 
	return ret;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

{

	unsigned long flags;



	raw_local_irq_save(flags);

	*addr &= ~mask;

	raw_local_irq_restore(flags);

}



#endif /* __LINUX_ARM_ARCH__ */



#define atomic_xchg(v, new) (xchg(&((v)->counter), new))

arch/arm64/include/asm/atomic.h

+0 −14
Original line number Diff line number Diff line
@@ -126,20 +126,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 
	return oldval;

}



static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

{

	unsigned long tmp, tmp2;



	asm volatile("// atomic_clear_mask\n"

"1:	ldxr	%0, %2\n"

"	bic	%0, %0, %3\n"

"	stxr	%w1, %0, %2\n"

"	cbnz	%w1, 1b"

	: "=&r" (tmp), "=&r" (tmp2), "+Q" (*addr)

	: "Ir" (mask)

	: "cc");

}



#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



static inline int __atomic_add_unless(atomic_t *v, int a, int u)