diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-01 08:10:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-01 08:24:41 +0100 |
| commit | fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a (patch) | |
| tree | ea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6 /arch/x86/include/asm/percpu.h | |
| parent | f9f9ffc237dd924f048204e8799da74f9ecf40cf (diff) | |
| parent | 52469b4fcd4fc433ffc78cec4cf94368e9052890 (diff) | |
| download | op-kernel-dev-fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a.zip op-kernel-dev-fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a.tar.gz | |
Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:
Conflicts:
mm/huge_memory.c
mm/memory.c
mm/mprotect.c
See this upstream merge commit for more details:
52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/percpu.h')
| -rw-r--r-- | arch/x86/include/asm/percpu.h | 3 |
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); \ |
