From patchwork Sat Jan 15 20:38:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 481561 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 p0FKcxOG023040 for ; Sat, 15 Jan 2011 20:38:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753937Ab1AOUi5 (ORCPT ); Sat, 15 Jan 2011 15:38:57 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:38814 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753933Ab1AOUi5 (ORCPT ); Sat, 15 Jan 2011 15:38:57 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 3E56A19FCE8; Sat, 15 Jan 2011 21:24:52 +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 30897-04; Sat, 15 Jan 2011 21:24:33 +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 1F83A1A0FF3; Sat, 15 Jan 2011 21:24:33 +0100 (CET) From: "Rafael J. Wysocki" To: Andres Salomon Subject: Re: [PATCH] ACPI: don't attempt to use hest_tab unless !acpi_pci_disabled Date: Sat, 15 Jan 2011 21:38:10 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Huang Ying , Jesse Barnes References: <20110114181620.188e7a62@queued.net> <201101151401.18846.rjw@sisk.pl> <20110115123233.2727f871@queued.net> In-Reply-To: <20110115123233.2727f871@queued.net> MIME-Version: 1.0 Message-Id: <201101152138.11183.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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]); Sat, 15 Jan 2011 20:39:01 +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,8 +201,10 @@ void __init acpi_hest_init(void) int rc = -ENODEV; unsigned int ghes_count = 0; - if (acpi_disabled) + if (acpi_disabled) { + hest_disable = 1; return; + } if (hest_disable) { pr_info(HEST_PFX "Table parsing disabled.\n");