diff options
| author | Len Brown <len.brown@intel.com> | 2004-08-13 18:32:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-08-13 18:32:45 -0400 |
| commit | 5fd850a803547db7560e9ba72e8c886d9905d27e (patch) | |
| tree | 72e2973db71bac234c8243068738a6c6ebfe2f55 /arch | |
| parent | 858cb35b83cd1c1d473097df893a406148f35914 (diff) | |
| parent | 7a4bd3568f114d5936a3a6836cf1448e1ffa1651 (diff) | |
| download | history-5fd850a803547db7560e9ba72e8c886d9905d27e.tar.gz | |
merge
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/dmi_scan.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c index d2d2610f2895e6..669470b42c597c 100644 --- a/arch/i386/kernel/dmi_scan.c +++ b/arch/i386/kernel/dmi_scan.c @@ -163,27 +163,6 @@ static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string) #define MATCH DMI_MATCH /* - * Some machines, usually laptops, can't handle an enabled local APIC. - * The symptoms include hangs or reboots when suspending or resuming, - * attaching or detaching the power cord, or entering BIOS setup screens - * through magic key sequences. - */ -static int __init local_apic_kills_bios(struct dmi_blacklist *d) -{ -#ifdef CONFIG_X86_LOCAL_APIC - extern int enable_local_apic; - if (enable_local_apic == 0) { - enable_local_apic = -1; - printk(KERN_WARNING "%s with broken BIOS detected. " - "Refusing to enable the local APIC.\n", - d->ident); - } -#endif - return 0; -} - - -/* * Toshiba keyboard likes to repeat keys when they are not repeated. */ @@ -284,32 +263,6 @@ static __init int disable_acpi_pci(struct dmi_blacklist *d) static __initdata struct dmi_blacklist dmi_blacklist[]={ - /* Machines which have problems handling enabled local APICs */ - - { local_apic_kills_bios, "Dell Inspiron", { - MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), - MATCH(DMI_PRODUCT_NAME, "Inspiron"), - NO_MATCH, NO_MATCH - } }, - - { local_apic_kills_bios, "Dell Latitude", { - MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), - MATCH(DMI_PRODUCT_NAME, "Latitude"), - NO_MATCH, NO_MATCH - } }, - - { local_apic_kills_bios, "IBM Thinkpad T20", { - MATCH(DMI_BOARD_VENDOR, "IBM"), - MATCH(DMI_BOARD_NAME, "264741U"), - NO_MATCH, NO_MATCH - } }, - - { local_apic_kills_bios, "ASUS L3C", { - MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), - MATCH(DMI_BOARD_NAME, "P4_L3C"), - NO_MATCH, NO_MATCH - } }, - { broken_toshiba_keyboard, "Toshiba Satellite 4030cdt", { /* Keyboard generates spurious repeats */ MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), NO_MATCH, NO_MATCH, NO_MATCH |