Commit afe64d5c authored by Russell King's avatar Russell King

[ARM] Remove "%?" from within macros containing assembly.

Some compilers seem to get "%?" wrong in macros.
parent 9ac89901
...@@ -345,7 +345,7 @@ static inline unsigned long __ffs(unsigned long word) ...@@ -345,7 +345,7 @@ static inline unsigned long __ffs(unsigned long word)
extern __inline__ int generic_fls(int x); extern __inline__ int generic_fls(int x);
#define fls(x) \ #define fls(x) \
( __builtin_constant_p(x) ? generic_fls(x) : \ ( __builtin_constant_p(x) ? generic_fls(x) : \
({ int __r; asm("clz%?\t%0, %1" : "=r"(__r) : "r"(x)); 32-__r; }) ) ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
#define __ffs(x) (ffs(x) - 1) #define __ffs(x) (ffs(x) - 1)
#define ffz(x) __ffs( ~(x) ) #define ffz(x) __ffs( ~(x) )
......
...@@ -50,8 +50,10 @@ ...@@ -50,8 +50,10 @@
#define read_cpuid(reg) \ #define read_cpuid(reg) \
({ \ ({ \
unsigned int __val; \ unsigned int __val; \
asm("mrc%? p15, 0, %0, c0, c0, " __stringify(reg) \ asm("mrc p15, 0, %0, c0, c0, " __stringify(reg) \
: "=r" (__val)); \ : "=r" (__val) \
: \
: "cc"); \
__val; \ __val; \
}) })
......
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