From patchwork Tue Sep 22 18:45:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1369226 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=85.214.62.61; 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=UTDQNxXQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4BwrCM1spMz9sTg for ; Wed, 23 Sep 2020 04:57:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED3A4826D3; Tue, 22 Sep 2020 20:49:25 +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="UTDQNxXQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97D0C823F7; Tue, 22 Sep 2020 20:47:33 +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=-3.5 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-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) (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 8153182612 for ; Tue, 22 Sep 2020 20:47:20 +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-ot1-x343.google.com with SMTP id h17so16616145otr.1 for ; Tue, 22 Sep 2020 11:47:20 -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=ie9c2tlrgcS2AUC0Vpz8IOur8A3EJIRH6glz6TQ52zI=; b=UTDQNxXQhHI9rZzykS8Xgl1YjahTj5b2LATWAK8O+VZtfp5i03QHaLVKzrIM6J/r5B 7w0+/II+ZIyfEjJlozC8I7+J96Rq/qy4YIFrUPKb8X/o6ZBzpVjsBdx0BJ/24abQzryB 9UJOMfrr7ATK0we2fwnmGCg7MI2AmJJoOddWE= 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=ie9c2tlrgcS2AUC0Vpz8IOur8A3EJIRH6glz6TQ52zI=; b=Uo6OWj/enVwrlNLikpSyd+aYbCXNUYdN1rxyNz+1KS71mnwjTphrBpbiJbz3tHnNpB kUwQ0uM3JhVXqw1y4Nwpwl+7ILLx0++bshEm0mTOUo7E/qsHbFn++9imToCBfsGlWptj Vsth9CMh1qOAo7IZh8WvJYIAZGDE9bPkYkRGQNI3gmozBN34Jx88xYwx35Bx6D5WVHvJ kTfslnv/CQi4EoM2NNkrj81V0+QD+T/vwqvE94h8653ZJ7AkLDCiAGCPgDBEZVsIwlKc GXdBbiyyP3MN/U7WvD4wksosszBLF6XeHkLwbdvgVNBBlPHKhLlVBE+DsJdTR6sJcn8w Nl0w== X-Gm-Message-State: AOAM533rea/TKtstXKZ71/90Ck4e8LRSlQkxmGBwLis7BviYN4uWLoTy 3dakUfPgtIG8+MmvtomxM+qp6XQwiLOAMUCF X-Google-Smtp-Source: ABdhPJzpJ4jHzec7X6itGAW7eU3n2MaGihcc/Yyx9Sh9gC0JhAvOZ7JvRIVWp0QzcIP8D4oN4a//TA== X-Received: by 2002:a9d:621a:: with SMTP id g26mr3921283otj.209.1600800439217; Tue, 22 Sep 2020 11:47:19 -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 q24sm7622663oij.19.2020.09.22.11.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2020 11:47:18 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Andy Shevchenko , Wolfgang Wallner , Bin Meng , Bernhard Messerklinger , Simon Glass Subject: [PATCH v4 56/59] x86: Move include of bitops out of ACPI region Date: Tue, 22 Sep 2020 12:45:41 -0600 Message-Id: <20200922184544.2920969-26-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200922184544.2920969-1-sjg@chromium.org> References: <20200922184544.2920969-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; /*