diff options
Diffstat (limited to 'xen-2.4.16/arch/i386/setup.c')
| -rw-r--r-- | xen-2.4.16/arch/i386/setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xen-2.4.16/arch/i386/setup.c b/xen-2.4.16/arch/i386/setup.c index b5618485ec..f4f62c2b02 100644 --- a/xen-2.4.16/arch/i386/setup.c +++ b/xen-2.4.16/arch/i386/setup.c @@ -103,6 +103,7 @@ static void __init init_amd(struct cpuinfo_x86 *c) */ void __init identify_cpu(struct cpuinfo_x86 *c) { + extern int opt_noht, opt_noacpi; int junk, i; u32 xlvl, tfms; @@ -163,6 +164,12 @@ void __init identify_cpu(struct cpuinfo_x86 *c) panic("Only support Intel processors (P6+)\n"); } + if ( opt_noht ) + { + opt_noacpi = 1; /* Virtual CPUs only appear in ACPI tables. */ + clear_bit(X86_FEATURE_HT, &c->x86_capability[0]); + } + printk("CPU caps: %08x %08x %08x %08x\n", c->x86_capability[0], c->x86_capability[1], |