From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: Early init patch breaks Dell laptops Date: 10 Oct 2004 04:44:43 -0400 Sender: acpi-devel-admin-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Message-ID: <1097397880.16792.23.camel@d845pe> References: <3ACA40606221794F80A5670F0AF15F8405BD1224@pdsmsx403> <416822C3.1040503@gentoo.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-AoeFo7QDOQRFoJCH7xM4" Return-path: In-Reply-To: <416822C3.1040503-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> Errors-To: acpi-devel-admin-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: Daniel Drake Cc: Luming Yu , ACPI Developers List-Id: linux-acpi@vger.kernel.org --=-AoeFo7QDOQRFoJCH7xM4 Content-Type: text/plain Content-Transfer-Encoding: 7bit Let me know if this doesn't address all of the regressions. thanks, -Len --=-AoeFo7QDOQRFoJCH7xM4 Content-Disposition: attachment; filename=lapic.patch Content-Type: text/plain; name=lapic.patch; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit ===== arch/i386/kernel/apic.c 1.60 vs 1.61 ===== --- 1.60/arch/i386/kernel/apic.c 2004-10-06 21:10:37 -04:00 +++ 1.61/arch/i386/kernel/apic.c 2004-10-10 04:12:38 -04:00 @@ -690,22 +690,8 @@ goto no_apic; } - if (!cpu_has_apic) { - /* - * Some BIOSes disable the local APIC in the - * APIC_BASE MSR. This can only be done in - * software for Intel P6 and AMD K7 (Model > 1). - */ - rdmsr(MSR_IA32_APICBASE, l, h); - if (!(l & MSR_IA32_APICBASE_ENABLE)) { - apic_printk(APIC_VERBOSE, "Local APIC disabled " - "by BIOS -- reenabling.\n"); - l &= ~MSR_IA32_APICBASE_BASE; - l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE; - wrmsr(MSR_IA32_APICBASE, l, h); - enabled_via_apicbase = 1; - } - } + if (!cpu_has_apic) + goto no_apic; /* * The APIC feature bit should now be enabled * in `cpuid' --=-AoeFo7QDOQRFoJCH7xM4-- ------------------------------------------------------- This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more http://productguide.itmanagersjournal.com/guidepromo.tmpl