diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-27 01:17:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-27 01:17:50 +0300 |
| commit | 6f8c480f998a619082f18407f8d7f4c29e94dc6e (patch) | |
| tree | 5047fe0d685fe9eab64c506fa1001e7df5e65faa /arch/x86_64 | |
| parent | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (diff) | |
| parent | bd5ab26a7d0cc834d846fe5dd7291f0aed3be72b (diff) | |
| download | linux-6f8c480f998a619082f18407f8d7f4c29e94dc6e.tar.xz | |
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')
| -rw-r--r-- | arch/x86_64/kernel/cpufreq/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86_64/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86_64/lib/msr-on-cpu.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig index 45a6a1fd14ac..ced15d06f0f3 100644 --- a/arch/x86_64/kernel/cpufreq/Kconfig +++ b/arch/x86_64/kernel/cpufreq/Kconfig @@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO config X86_SPEEDSTEP_CENTRINO_ACPI bool depends on X86_SPEEDSTEP_CENTRINO - default y config X86_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" 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 \ diff --git a/arch/x86_64/lib/msr-on-cpu.c b/arch/x86_64/lib/msr-on-cpu.c new file mode 100644 index 000000000000..47e0ec47c376 --- /dev/null +++ b/arch/x86_64/lib/msr-on-cpu.c @@ -0,0 +1 @@ +#include "../../i386/lib/msr-on-cpu.c" |