summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 21:27:10 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 21:27:10 (GMT)
commit12aee278b50c4a94a93fa0b4d201ae35d792c696 (patch)
tree98c0c42c9095aae34d12a4b8c555176698b7202a /arch
parentc56b097af26cb11c1f49a4311ba538c825666fed (diff)
parent5e8cfc3c75b3e43497389896c0ecda62fc311ce9 (diff)
downloadlinux-fsl-qoriq-12aee278b50c4a94a93fa0b4d201ae35d792c696.tar.xz
Merge branch 'akpm' (fixes from Andrew Morton)
Merge three fixes from Andrew Morton. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: memcg: use __this_cpu_sub() to dec stats to avoid incorrect subtrahend casting percpu: fix this_cpu_sub() subtrahend casting for unsigneds mm/pagewalk.c: fix walk_page_range() access of wrong PTEs
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/percpu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 0da5200..b3e18f8 100644
--- 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); \