From 8353fc0f41d4698b5ae9d62c23a8480f5e2dcab0 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 1 Oct 2009 07:30:38 +0200 Subject: [PATCH] --- yaml --- r: 166885 b: refs/heads/master c: 04edbdef02ec4386a2ae38cab7ae7d166e17a756 h: refs/heads/master i: 166883: a7476b601cb60703ebd1eb1d3c43f6deff970a4b v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/i386_ksyms_32.c | 2 ++ trunk/arch/x86/lib/Makefile | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebcf0cdd578d..46f8a9746161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1716a60a8ea90788d24aa22d7eec83fbdd2d88a +refs/heads/master: 04edbdef02ec4386a2ae38cab7ae7d166e17a756 diff --git a/trunk/arch/x86/kernel/i386_ksyms_32.c b/trunk/arch/x86/kernel/i386_ksyms_32.c index 1736c5a725aa..9c3bd4a2050e 100644 --- a/trunk/arch/x86/kernel/i386_ksyms_32.c +++ b/trunk/arch/x86/kernel/i386_ksyms_32.c @@ -15,8 +15,10 @@ EXPORT_SYMBOL(mcount); * the export, but dont use it from C code, it is used * by assembly code and is not using C calling convention! */ +#ifndef CONFIG_X86_CMPXCHG64 extern void cmpxchg8b_emu(void); EXPORT_SYMBOL(cmpxchg8b_emu); +#endif /* Networking helper routines. */ EXPORT_SYMBOL(csum_partial_copy_generic); diff --git a/trunk/arch/x86/lib/Makefile b/trunk/arch/x86/lib/Makefile index 3e549b8ec8c9..85f5db95c60f 100644 --- a/trunk/arch/x86/lib/Makefile +++ b/trunk/arch/x86/lib/Makefile @@ -15,8 +15,10 @@ ifeq ($(CONFIG_X86_32),y) obj-y += atomic64_32.o lib-y += checksum_32.o lib-y += strstr_32.o - lib-y += semaphore_32.o string_32.o cmpxchg8b_emu.o - + lib-y += semaphore_32.o string_32.o +ifneq ($(CONFIG_X86_CMPXCHG64),y) + lib-y += cmpxchg8b_emu.o +endif lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else obj-y += io_64.o iomap_copy_64.o