The patch titled um: disable CONFIG_CMPXCHG_LOCAL has been added to the -mm tree. Its filename is um-disable-config_cmpxchg_local.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: um: disable CONFIG_CMPXCHG_LOCAL From: Richard Weinberger <richard@xxxxxx> Commit 8a5ec0ba "Lockless (and preemptless) fastpaths for slub" makes use of this_cpu_cmpxchg_double() which needs this_cpu_cmpxchg16b_emu() on x86_64. Implementing cmpxchg16b emulation for UML would introduce too much complexity. So just disable it. Signed-off-by: Richard Weinberger <richard@xxxxxx> Reported-by: Sergei Trofimovich <slyich@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/Kconfig.x86 | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/um/Kconfig.x86~um-disable-config_cmpxchg_local arch/um/Kconfig.x86 --- a/arch/um/Kconfig.x86~um-disable-config_cmpxchg_local +++ a/arch/um/Kconfig.x86 @@ -4,6 +4,10 @@ menu "UML-specific options" menu "Host processor type and features" +config CMPXCHG_LOCAL + bool + default n + source "arch/x86/Kconfig.cpu" endmenu _ Patches currently in -mm which might be from richard@xxxxxx are um-fix-call-tracer-and-bug-handler.patch um-disable-config_cmpxchg_local.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html