From patchwork Sun Jan 16 19:44:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 482631 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0GJkXxS024919 for ; Sun, 16 Jan 2011 19:46:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753896Ab1APTpv (ORCPT ); Sun, 16 Jan 2011 14:45:51 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:39845 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753824Ab1APTpj (ORCPT ); Sun, 16 Jan 2011 14:45:39 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 835B719FBD1; Sun, 16 Jan 2011 20:31:31 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 10691-08; Sun, 16 Jan 2011 20:31:08 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id AE3811A1F28; Sun, 16 Jan 2011 20:31:08 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 2/2] ACPI: Fix boot problem related to APEI with acpi_disabled set Date: Sun, 16 Jan 2011 20:44:22 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: Jesse Barnes , ACPI Devel Maling List , linux-pci@vger.kernel.org, LKML , Stephen Rothwell , Andres Salomon , Linus Torvalds References: <201101162041.02419.rjw@sisk.pl> In-Reply-To: <201101162041.02419.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201101162044.22325.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 16 Jan 2011 19:46:54 +0000 (UTC) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -631,11 +631,11 @@ static int acpi_pci_root_remove(struct a static int __init acpi_pci_root_init(void) { + acpi_hest_init(); + if (acpi_pci_disabled) return 0; - acpi_hest_init(); - pci_acpi_crs_quirks(); if (acpi_bus_register_driver(&acpi_pci_root_driver) < 0) return -ENODEV; Index: linux-2.6/drivers/acpi/apei/hest.c =================================================================== --- linux-2.6.orig/drivers/acpi/apei/hest.c +++ linux-2.6/drivers/acpi/apei/hest.c @@ -201,14 +201,14 @@ void __init acpi_hest_init(void) int rc = -ENODEV; unsigned int ghes_count = 0; - if (acpi_disabled) - return; - if (hest_disable) { pr_info(HEST_PFX "Table parsing disabled.\n"); return; } + if (acpi_disabled) + goto err; + status = acpi_get_table(ACPI_SIG_HEST, 0, (struct acpi_table_header **)&hest_tab); if (status == AE_NOT_FOUND) {