summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/lib/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 23:17:50 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 23:17:50 +0100
commit6f8c480f998a619082f18407f8d7f4c29e94dc6e (patch)
tree5047fe0d685fe9eab64c506fa1001e7df5e65faa /arch/x86_64/lib/Makefile
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[CPUFREQ] constify some data tables. (diff)
downloadlinux-6f8c480f998a619082f18407f8d7f4c29e94dc6e.tar.xz
linux-6f8c480f998a619082f18407f8d7f4c29e94dc6e.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] constify some data tables. [CPUFREQ] constify cpufreq_driver where possible. {rd,wr}msr_on_cpu SMP=n optimization [CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR rdmsr_on_cpu, wrmsr_on_cpu [CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Diffstat (limited to 'arch/x86_64/lib/Makefile')
-rw-r--r--arch/x86_64/lib/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 8d5f835af481..c94327178398 100644
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -5,6 +5,7 @@
CFLAGS_csum-partial.o := -funroll-loops
obj-y := io.o iomap_copy.o
+obj-$(CONFIG_SMP) += msr-on-cpu.o
lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \
usercopy.o getuser.o putuser.o \