]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
[PATCH] fix subarchitecture breakage with CONFIG_SCHED_SMT
authorJames Bottomley <James.Bottomley@SteelEye.com>
Tue, 27 Jun 2006 09:53:49 +0000 (02:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 00:32:38 +0000 (17:32 -0700)
commit96c52749036eca2b131f435d3895a3c6aba92e76
tree77b92dfa86d4d81b3ee11f2517e118c6025026c6
parent4031ff388138b58e5cd472dccce38828bcb8c706
[PATCH] fix subarchitecture breakage with CONFIG_SCHED_SMT

Commit 1e9f28fa1eb9773bf65bae08288c6a0a38eef4a7 ("[PATCH] sched: new
sched domain for representing multi-core") incorrectly made 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@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/Kconfig
arch/i386/kernel/cpu/common.c
arch/i386/kernel/cpu/intel_cacheinfo.c