diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-06 22:57:19 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-06 22:57:19 +0100 |
commit | 0aac6a9501656f96c8b1291586605e5113b004f3 (patch) | |
tree | 2e6dd5d996a56f4093a6b60d6fc3dfbdbcf792be | |
parent | 985a83a72539662d96193bb5477ebf94db2c6e1c (diff) | |
parent | 3c8167f96df4c45c659ad6df520e3449587a7d5d (diff) |
Merge branch 'rt/head' into rt/2.6.31
-rw-r--r-- | arch/x86/kernel/cpu/Makefile | 4 | ||||
-rw-r--r-- | include/linux/sched.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 8dd30638fe44..66c85131f74c 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -13,7 +13,9 @@ CFLAGS_common.o := $(nostackp) 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 +obj-y += vmware.o hypervisor.o + +obj-$(CONFIG_SMP) += sched.o obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o obj-$(CONFIG_X86_64) += bugs_64.o diff --git a/include/linux/sched.h b/include/linux/sched.h index 676126d56894..dedc29ec574c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1047,7 +1047,7 @@ partition_sched_domains(int ndoms_new, struct cpumask *doms_new, } #endif /* !CONFIG_SMP */ - +struct sched_domain; unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu); unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu); |