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

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
...@@ -60,13 +60,13 @@ ...@@ -60,13 +60,13 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef CONFIG_CPU_USE_DOMAINS #ifdef CONFIG_CPU_USE_DOMAINS
#define set_domain(x) \ static inline void set_domain(unsigned val)
do { \ {
__asm__ __volatile__( \ asm volatile(
"mcr p15, 0, %0, c3, c0 @ set domain" \ "mcr p15, 0, %0, c3, c0 @ set domain"
: : "r" (x)); \ : : "r" (val));
isb(); \ isb();
} while (0) }
#define modify_domain(dom,type) \ #define modify_domain(dom,type) \
do { \ do { \
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
} while (0) } while (0)
#else #else
#define set_domain(x) do { } while (0) static inline void set_domain(unsigned val) { }
#define modify_domain(dom,type) do { } while (0) static inline void modify_domain(unsigned dom, unsigned type) { }
#endif #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment