projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
percpu.h
diff --git
a/arch/x86/include/asm/percpu.h
b/arch/x86/include/asm/percpu.h
index
604e13d
..
94220d1
100644
(file)
--- a/
arch/x86/include/asm/percpu.h
+++ b/
arch/x86/include/asm/percpu.h
@@
-128,7
+128,8
@@
do { \
do { \
typedef typeof(var) pao_T__; \
const int pao_ID__ = (__builtin_constant_p(val) && \
- ((val) == 1 || (val) == -1)) ? (val) : 0; \
+ ((val) == 1 || (val) == -1)) ? \
+ (int)(val) : 0; \
if (0) { \
pao_T__ pao_tmp__; \
pao_tmp__ = (val); \