From patchwork Sun Sep 6 21:44:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1358511 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Uajmer9l; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bl4vY4hYJz9sSn for ; Mon, 7 Sep 2020 07:54:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 71ABB824F6; Sun, 6 Sep 2020 23:45:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Uajmer9l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5791C823EA; Sun, 6 Sep 2020 23:45:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 70E778245D for ; Sun, 6 Sep 2020 23:45:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd41.google.com with SMTP id j2so12174660ioj.7 for ; Sun, 06 Sep 2020 14:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SSfhB5IIcDMvyn9cKjNIV05VTOa7/HqviTYa76RvVRY=; b=Uajmer9lRAtS71dfAOXuqSso/YNSGsZA9NdvP/c4lba4G0XzEBOVugiac4yRBIRXJk eixFNPtATtiJ129gVA5Nq46uZQgFaMLo6cz6atHv3vCXVOGho4OsfDxVC2skaExF8a+S edtHdI0MVGLhzYfN3xAMD6wxmiYl0TYpE4k6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SSfhB5IIcDMvyn9cKjNIV05VTOa7/HqviTYa76RvVRY=; b=TiFDwFss0auaf8R5OBeLyTD2p0pNOaccEGG+7qXdBcfptYlBNuICAedT9WvqEzrsEn Vfl6Cn8mYNu64+vgJNtPAeoyXXXkmB/TWAfyBXVGQxhOy3HnH94MFlPOtwtKAlgxHZss c/0efuBR4ZfwE9hg254eN/SYXX6e9n1V19VtFQXJXCnjapqXzLfqiynckZ+ITukHOdLd 5zCWdTu/ipDibuxUK1e++ZzR5G283n7DFFAHXculEcXpvQlLfsHFPHyiUqVxYaxLrM4b Uv4R/f+ia1XDRv9YlsGRIIiW3PcAI+ukaDYCnLlji0CALv5FgUebOMnaG3D8zbQWS63L sxWQ== X-Gm-Message-State: AOAM5311MhxgE5KZFW0exSsnkYP3Ogzu0O+c/jr3wlRzw5XhRzO0VSMA Ty4zp+vCeSioY0ideGbw47m/xpR8zQ9n0vxg X-Google-Smtp-Source: ABdhPJyPxdL8YNNgp5n9g3lZN+EXnlDZRIrPoEN8YIpFx5Z1qiwXXGtmKUbBWhiqvcyHl2kcdiQmZA== X-Received: by 2002:a6b:8b52:: with SMTP id n79mr14846457iod.122.1599428705246; Sun, 06 Sep 2020 14:45:05 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id w13sm6232663iox.10.2020.09.06.14.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 14:45:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Andy Shevchenko , Simon Glass Subject: [PATCH v3 56/57] x86: Move include of bitops out of ACPI region Date: Sun, 6 Sep 2020 15:44:04 -0600 Message-Id: <20200906214405.71632-21-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.526.ge36021eeef-goog In-Reply-To: <20200906214405.71632-1-sjg@chromium.org> References: <20200906214405.71632-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean At present linux/bitops.h is included in ACPI code. This is not needed and can cause a problem in fls64.h since BITS_PER_LONG is not defined. Move the #include into the part not used by ACPI. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- (no changes since v2) Changes in v2: - Add new patch to move include of bitops out of ACPI region include/acpi/acpi_table.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 3a243bf19ce..abbca6530db 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -14,7 +14,6 @@ #define __ACPI_TABLE_H__ #include -#include #define RSDP_SIG "RSD PTR " /* RSDP pointer signature */ #define OEM_ID "U-BOOT" /* U-Boot */ @@ -29,6 +28,8 @@ #if !defined(__ACPI__) +#include + struct acpi_ctx; /*