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

Commit 82401bf1 authored by Russell King's avatar Russell King
Browse files

ARM: fix set_domain() macro 



Avoid polluting drivers with a set_domain() macro, which interferes with
structure member names:

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c:294:33: error: macro "set_domain" passed 2 arguments, but takes just 1

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 32e1eb59

arch/arm/include/asm/domain.h

+9 −9
Original line number Diff line number Diff line
@@ -60,13 +60,13 @@ 
#ifndef __ASSEMBLY__



#ifdef CONFIG_CPU_USE_DOMAINS

#define set_domain(x)					\

	do {						\

	__asm__ __volatile__(				\

	"mcr	p15, 0, %0, c3, c0	@ set domain"	\

	  : : "r" (x));					\

	isb();						\

	} while (0)

static inline void set_domain(unsigned val)

{

	asm volatile(

	"mcr	p15, 0, %0, c3, c0	@ set domain"

	  : : "r" (val));

	isb();

}



#define modify_domain(dom,type)					\

	do {							\
@@ -78,8 +78,8 @@ 
	} while (0)



#else

#define set_domain(x)		do { } while (0)

#define modify_domain(dom,type)	do { } while (0)

static inline void set_domain(unsigned val) { }

static inline void modify_domain(unsigned dom, unsigned type)	{ }

#endif



/*