korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 16:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: fix set_domain() macro

Browse Source 
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: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2012-07-04 17:05:28 +01:00
parent 32e1eb59f7
commit 82401bf105
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/include/asm/domain.h
View File

@ -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 @@
} 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
/* /*