From: Simon Glass <sjg@chromium.org>
Date: Tue, 22 Sep 2020 18:45:41 +0000 (-0600)
Subject: x86: Move include of bitops out of ACPI region
X-Git-Tag: v2021.10~497^2~10^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee3cb7c648988aa5f7ae0872ecfb6bdcfa9c6c76;p=platform%2Fkernel%2Fu-boot.git

x86: Move include of bitops out of ACPI region

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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h
index 3a243bf..abbca65 100644
--- a/include/acpi/acpi_table.h
+++ b/include/acpi/acpi_table.h
@@ -14,7 +14,6 @@
 #define __ACPI_TABLE_H__
 
 #include <dm/acpi.h>
-#include <linux/bitops.h>
 
 #define RSDP_SIG		"RSD PTR "	/* RSDP pointer signature */
 #define OEM_ID			"U-BOOT"	/* U-Boot */
@@ -29,6 +28,8 @@
 
 #if !defined(__ACPI__)
 
+#include <linux/bitops.h>
+
 struct acpi_ctx;
 
 /*