[PATCH v3 56/57] x86: Move include of bitops out of ACPI region

Simon Glass
2020-09-06T21:44:04Z

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>
---

(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 <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;

/*
--
2.28.0.526.ge36021eeef-goog