From: Tejun Heo <tj@kernel.org>
Date: Tue, 24 May 2011 08:09:54 +0000 (+0200)
Subject: Merge branch 'for-2.6.40' into merged-2.6.40
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e7bfd5048a848cc03164b5893865a573dd0014;p=pandora-kernel.git

Merge branch 'for-2.6.40' into merged-2.6.40

Conflicts:
	arch/x86/include/asm/percpu.h

Conflict caused between b1e7734f02 (x86, percpu: Use ASM_NOP4 instead
of hardcoding P6_NOP4) and 5f55924dea (percpu: Avoid extra NOP in
percpu_cmpxchg16b_double).  The former updates P6_NOP4 used in
percpu_cmpxchg16b_double() to ASM_NOP4 while the latter makes the
whole thing into CMPXCHG16B_EMU_CALL macro which changes depending on
CONFIG_SMP.

Updating CMPXCHG16B_EMU_CALL macro to use ASM_NOP* and using it
resolves the conflict.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

e1e7bfd5048a848cc03164b5893865a573dd0014
Reading git-diff-tree failed