[tip:x86/asm] x86, asm: Move cmpxchg emulation code to arch/x86/lib
in [Kernel]
|
Prev: [PATCH 15/17] x86: Remove not used early_res code
Next: [tip:x86/asm] x86, asm: Merge cmpxchg_486_u64() and cmpxchg8b_emu()
From: tip-bot for H. Peter Anvin on 29 Jul 2010 16:20 Commit-ID: 90c8f92f5c807807ca74d5f2f313794925174e6b Gitweb: http://git.kernel.org/tip/90c8f92f5c807807ca74d5f2f313794925174e6b Author: H. Peter Anvin <hpa(a)linux.intel.com> AuthorDate: Wed, 28 Jul 2010 16:53:49 -0700 Committer: H. Peter Anvin <hpa(a)linux.intel.com> CommitDate: Wed, 28 Jul 2010 16:53:49 -0700 x86, asm: Move cmpxchg emulation code to arch/x86/lib Move cmpxchg emulation code from arch/x86/kernel/cpu (which is otherwise CPU identification) to arch/x86/lib, where other emulation code lives already. Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com> LKML-Reference: <AANLkTikAmaDPji-TVDarmG1yD=fwbffcsmEU=YEuP+8r(a)mail.gmail.com> --- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/lib/Makefile | 1 + arch/x86/{kernel/cpu => lib}/cmpxchg.c | 0 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 3a785da..c47c439 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -16,7 +16,7 @@ obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o capflags.o powerflags.o common.o obj-y += vmware.o hypervisor.o sched.o mshyperv.o -obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o +obj-$(CONFIG_X86_32) += bugs.o obj-$(CONFIG_X86_64) += bugs_64.o obj-$(CONFIG_CPU_SUP_INTEL) += intel.o diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f871e04..e10cf07 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -30,6 +30,7 @@ ifeq ($(CONFIG_X86_32),y) lib-y += checksum_32.o lib-y += strstr_32.o lib-y += semaphore_32.o string_32.o + lib-y += cmpxchg.o ifneq ($(CONFIG_X86_CMPXCHG64),y) lib-y += cmpxchg8b_emu.o atomic64_386_32.o endif diff --git a/arch/x86/kernel/cpu/cmpxchg.c b/arch/x86/lib/cmpxchg.c similarity index 100% rename from arch/x86/kernel/cpu/cmpxchg.c rename to arch/x86/lib/cmpxchg.c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |