---

yaml --- r: 205484 b: refs/heads/master c: 90c8f92 h: refs/heads/master v: v3
git-mirror · Jul 28, 2010 · 07cf9f9 · 07cf9f9
1 parent f3eaec7
commit 07cf9f9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4532b305e8f0c238dd73048068ff8a6dd1380291
+refs/heads/master: 90c8f92f5c807807ca74d5f2f313794925174e6b
diff --git a/trunk/arch/x86/kernel/cpu/Makefile b/trunk/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/trunk/arch/x86/lib/Makefile b/trunk/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/trunk/arch/x86/kernel/cpu/cmpxchg.c → trunk/arch/x86/lib/cmpxchg.c b/trunk/arch/x86/kernel/cpu/cmpxchg.c → trunk/arch/x86/lib/cmpxchg.c