diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:43 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 22:54:43 +0200 |
| commit | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch) | |
| tree | 73162355b58283a2531f13fbbf663809f95c1483 /arch/x86_64/kernel/setup.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | [PATCH] sata_sil24: enable 64bit (diff) | |
| download | linux-a890b15c0990cc8d686edcc85f5fccde71ad5ce9.tar.xz linux-a890b15c0990cc8d686edcc85f5fccde71ad5ce9.zip | |
Merge branch 'upstream'
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0856ad444f90..c50b06765a80 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -353,8 +353,10 @@ static __init void parse_cmdline_early (char ** cmdline_p) if (fullarg(from, "enable_timer_pin_1")) disable_timer_pin_1 = -1; - if (fullarg(from, "nolapic") || fullarg(from, "disableapic")) + if (fullarg(from, "nolapic") || fullarg(from, "disableapic")) { + clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); disable_apic = 1; + } if (fullarg(from, "noapic")) skip_ioapic_setup = 1; |