From patchwork Sat Jan 15 07:54:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andres Salomon X-Patchwork-Id: 480951 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 p0F7tFZJ016499 for ; Sat, 15 Jan 2011 07:55:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751532Ab1AOHyr (ORCPT ); Sat, 15 Jan 2011 02:54:47 -0500 Received: from LUNGE.MIT.EDU ([18.54.1.69]:59248 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751519Ab1AOHyq convert rfc822-to-8bit (ORCPT ); Sat, 15 Jan 2011 02:54:46 -0500 Received: from localhost (c-71-231-141-121.hsd1.wa.comcast.net [71.231.141.121]) by lunge.queued.net (Postfix) with ESMTPSA id D05AF398053; Sat, 15 Jan 2011 02:54:41 -0500 (EST) Date: Fri, 14 Jan 2011 23:54:37 -0800 From: Andres Salomon To: Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Huang Ying , Jesse Barnes Subject: Re: [PATCH] ACPI: don't attempt to use hest_tab unless !acpi_pci_disabled Message-ID: <20110114235437.669f820d@queued.net> In-Reply-To: References: <20110114181620.188e7a62@queued.net> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 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 07:55:15 +0000 (UTC) diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 4ee58e7..7262eaf 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -89,7 +89,7 @@ int apei_hest_parse(apei_hest_func_t func, void *data) struct acpi_hest_header *hest_hdr; int i, rc, len; - if (hest_disable) + if (hest_disable || acpi_disabled) return -EINVAL; hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);