From patchwork Mon Oct 17 19:03:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lv Zheng X-Patchwork-Id: 9380245 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 910BD600CA for ; Mon, 17 Oct 2016 19:04:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75D2128D55 for ; Mon, 17 Oct 2016 19:04:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6619D28D68; Mon, 17 Oct 2016 19:04:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83CF128D55 for ; Mon, 17 Oct 2016 19:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935399AbcJQTER (ORCPT ); Mon, 17 Oct 2016 15:04:17 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:35688 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933253AbcJQTEK (ORCPT ); Mon, 17 Oct 2016 15:04:10 -0400 Received: by mail-qt0-f195.google.com with SMTP id g49so6573047qtc.2 for ; Mon, 17 Oct 2016 12:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=inHDU0ZHEDG2oimp3EVr70Oru/U9hQ9Fr6bgDy5BlQU=; b=bjXonGQ33t1Q9DeLaGUbSzsgceXV9mxdXptRdQnz9VrJnSRvKzD6LgO2Pquk2cwpw+ Brk+4UWBqmZsA/u8wzv2za0gqmEYmieL/MxIGjntkIkqSMfgHK2DGG+SGVAmwYr7rbc1 c/HgjJsgJ1GVTk5j9hA1mDm6wPvV0B/HkbGP/Ml0eZ76Q5qPOF/BPSeZ5nVEZN962mHQ f8lxa2aFN9ilk6sNM4ScV9ikY8OVy8ANEVQaANfwh4+RDZCvKpFJD2C7ij3eEoR1YuIr FSmExTnCjambDcWf4hFAr12PDMcP6wDvwVs4eCl4Me5/KQCnl+4DlyfRFWLKyTWQJktO Iqsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=inHDU0ZHEDG2oimp3EVr70Oru/U9hQ9Fr6bgDy5BlQU=; b=l7nE52dFtTed92Zj6moCk9svjrDg7YD0DXLd45CyrlpiLhpu+C5KLBWfKAOeqDLYBv c+kETGRpVN8jaDUfoyr6BFjdCi0XU8SA4HWIVZMdqkrzXCliBpnSTHFPglDoqfka1mtg 8JaRG2OfbX5gh4TXiHdiXboJe+DIZR/+wR7Vzi2nNxigXde8xOMqE5tmomCjvJruTBpo CGY1p9R2akLc3khfdNve+/Ge2qk3lW+dfg46ZRDrsddGZA1E9sfBQQpcdemi4zQy9sQh mUEn5BFgWhuuVMjlLtCHNPcTQcH+ukMaeuWRh7D6zWd/ShXcM1j8gg/fmWdNE2zg9v4M eMFw== X-Gm-Message-State: AA6/9Rn89+LmnXJ8YfPPsMywT7/d/8mbUJdl8Dyu4HaiYDdhQ+YUN0Q4dpX2MQKhqK/j5g== X-Received: by 10.237.34.51 with SMTP id n48mr26266505qtc.89.1476731050042; Mon, 17 Oct 2016 12:04:10 -0700 (PDT) Received: from localhost.localdomain (h3.246.129.40.static.ip.windstream.net. [40.129.246.3]) by smtp.gmail.com with ESMTPSA id r57sm15829748qtr.47.2016.10.17.12.04.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 12:04:09 -0700 (PDT) From: Lv Zheng X-Google-Original-From: Lv Zheng To: "Rafael J . Wysocki" , "Rafael J . Wysocki" , Robert Moore , Len Brown , Lv Zheng , "David E . Box" Cc: linux-acpi@vger.kernel.org Subject: [PATCH 6/7] ACPICA: Move acpi_gbl_max_loop_iterations to the public globals file Date: Tue, 18 Oct 2016 03:03:57 +0800 Message-Id: <8da8bbb2648dd4069f0d391333f8f028e63cafe4.1476725675.git.lv.zheng@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bob Moore ACPICA commit eb8b2194200867dec9ba38e5ab98b5b8ef262945 Moved to acpixf.h with the rest of the configuration globals. Link: https://github.com/acpica/acpica/commit/eb8b2194 Signed-off-by: Bob Moore Signed-off-by: Lv Zheng --- drivers/acpi/acpica/acglobal.h | 4 ---- include/acpi/acpixf.h | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index b549e6d..edbb42e 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h @@ -240,10 +240,6 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0); ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list); -/* Maximum number of While() loop iterations before forced abort */ - -ACPI_GLOBAL(u32, acpi_gbl_max_loop_iterations); - /* Control method single step flag */ ACPI_GLOBAL(u8, acpi_gbl_cm_single_step); diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index c7b3a13..07ab21e 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -259,6 +259,13 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0); ACPI_INIT_GLOBAL(u8, acpi_gbl_reduced_hardware, FALSE); /* + * Maximum number of While() loop iterations before forced method abort. + * This mechanism is intended to prevent infinite loops during interpreter + * execution within a host kernel. + */ +ACPI_INIT_GLOBAL(u32, acpi_gbl_max_loop_iterations, ACPI_MAX_LOOP_COUNT); + +/* * This mechanism is used to trace a specified AML method. The method is * traced each time it is executed. */