The patch titled
fix subarchitecture breakage with CONFIG_SCHED_SMT
has been removed from the -mm tree. Its filename is
fix-subarchitecture-breakage-with-config_sched_smt.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fix subarchitecture breakage with CONFIG_SCHED_SMT
From: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
The following: "[PATCH] sched: new sched domain for representing
multi-core"
Incorrectly makes SCHED_SMT and some of the structures it uses dependent on
SMP. However, this is wrong, the structures are only defined if X86_HT, so
SCHED_SMT has to depend on that as well.
The patch broke voyager, since it doesn't provide any of the multi-core
or hyperthreading structures.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/Kconfig | 4 ++--
arch/i386/kernel/cpu/common.c | 2 +-
arch/i386/kernel/cpu/intel_cacheinfo.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/i386/Kconfig~fix-subarchitecture-breakage-with-config_sched_smt arch/i386/Kconfig
--- a/arch/i386/Kconfig~fix-subarchitecture-breakage-with-config_sched_smt
+++ a/arch/i386/Kconfig
@@ -233,7 +233,7 @@ config NR_CPUS
config SCHED_SMT
bool "SMT (Hyperthreading) scheduler support"
- depends on SMP
+ depends on X86_HT
help
SMT scheduler support improves the CPU scheduler's decision making
when dealing with Intel Pentium 4 chips with HyperThreading at a
@@ -242,7 +242,7 @@ config SCHED_SMT
config SCHED_MC
bool "Multi-core scheduler support"
- depends on SMP
+ depends on X86_HT
default y
help
Multi-core scheduler support improves the CPU scheduler's decision
diff -puN arch/i386/kernel/cpu/common.c~fix-subarchitecture-breakage-with-config_sched_smt arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/common.c~fix-subarchitecture-breakage-with-config_sched_smt
+++ a/arch/i386/kernel/cpu/common.c
@@ -294,7 +294,7 @@ void __cpuinit generic_identify(struct c
if (c->x86 >= 0x6)
c->x86_model += ((tfms >> 16) & 0xF) << 4;
c->x86_mask = tfms & 15;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0);
#else
c->apicid = (ebx >> 24) & 0xFF;
diff -puN arch/i386/kernel/cpu/intel_cacheinfo.c~fix-subarchitecture-breakage-with-config_sched_smt arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c~fix-subarchitecture-breakage-with-config_sched_smt
+++ a/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -261,7 +261,7 @@ unsigned int __cpuinit init_intel_cachei
unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */
unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
unsigned int cpu = (c == &boot_cpu_data) ? 0 : (c - cpu_data);
#endif
@@ -383,14 +383,14 @@ unsigned int __cpuinit init_intel_cachei
if (new_l2) {
l2 = new_l2;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
cpu_llc_id[cpu] = l2_id;
#endif
}
if (new_l3) {
l3 = new_l3;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
cpu_llc_id[cpu] = l3_id;
#endif
}
_
Patches currently in -mm which might be from James.Bottomley@xxxxxxxxxxxx are
origin.patch
git-scsi-misc.patch
git-scsi-target.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
