From patchwork Sun Sep 23 04:34:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1495081 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 79A65DF24C for ; Sun, 23 Sep 2012 04:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753727Ab2IWEjy (ORCPT ); Sun, 23 Sep 2012 00:39:54 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:59900 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762Ab2IWEfa (ORCPT ); Sun, 23 Sep 2012 00:35:30 -0400 Received: by mail-qa0-f46.google.com with SMTP id c26so146466qad.19 for ; Sat, 22 Sep 2012 21:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:reply-to:organization; bh=yRp0/WECmIGEXLf7lXgHAazwgyJ9LH2xqPHQEPHkC4s=; b=xVuxx9SLOuZGYOxWuPUvRAvD6OsgvVImqR5hHI7PKoDytXQyEsuUC3HmAYdFgUUbgH J5kIJA3PK8qUNg/w3IaWG87t8f1FP9gnIv9df0e1S1Hm2+VFWVACIgcSPpd/3ve/DiMw bo9l2eemrJ4N5h39VqcDnWXTUNiNgPK6YtTuPTyrSWMNxRV3HIOMcTEaxEyLvKMEqtVR 82aLXNmJ1PzQhVOM0S9luJeiDnytW9fr+Ht7mLiTfDqZG6hx5l4F/kJqkjID0V9H4+69 1NtvxFjp51YSTGV0NxGJkp5Wi0Akh+ATOwO0pGUjGityC10PDdSNi4I16/5+zynu0dde sGZw== Received: by 10.224.193.193 with SMTP id dv1mr23763974qab.29.1348374930077; Sat, 22 Sep 2012 21:35:30 -0700 (PDT) Received: from x980.localdomain6 (pool-74-104-144-44.bstnma.fios.verizon.net. [74.104.144.44]) by mx.google.com with ESMTPS id ck11sm19871874qab.17.2012.09.22.21.35.29 (version=SSLv3 cipher=OTHER); Sat, 22 Sep 2012 21:35:29 -0700 (PDT) From: Len Brown To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 21/23] tools/power/acpi/acpidump: version 20071116 Date: Sun, 23 Sep 2012 00:34:09 -0400 Message-Id: <39a55ff2c34a11ab9bbc8ba6f4dfb5d366cb2532.1348371388.git.len.brown@intel.com> X-Mailer: git-send-email 1.7.12.1.396.g16eed7c In-Reply-To: <1348374851-20378-1-git-send-email-lenb@kernel.org> References: <1348374851-20378-1-git-send-email-lenb@kernel.org> In-Reply-To: References: Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Len Brown This is unchanged version 20071116, plus a small bit in DEFINE_ALTERNATE_TYPES to enable building with latest kernel headers. Signed-off-by: Len Brown --- tools/power/acpi/acpidump.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/power/acpi/acpidump.c b/tools/power/acpi/acpidump.c index 8e5e194..a63dee9 100644 --- a/tools/power/acpi/acpidump.c +++ b/tools/power/acpi/acpidump.c @@ -540,8 +540,11 @@ int main(int argc, char **argv) if (connect) { lseek(fd, sizeof(struct acpi_rsdp_descriptor), SEEK_SET); } - if (!acpi_dump_XSDT(fd, &rsdpx)) - goto not_found; + if (rsdpx.revision > 1 && rsdpx.xsdt_physical_address) { + /* ACPIDUMP uses xsdt table */ + if (!acpi_dump_XSDT(fd, &rsdpx)) + goto not_found; + } if (!acpi_dump_RSDT(fd, &rsdpx)) goto not_found; if (connect) {