linux-next: build failure after merge of the net-next tree

[Stephen Rothwell]

Hi all,

After merging the net-next tree, today's linux-next build (X86_64
allnoconfig) failed like this:

arch/x86/kernel/setup.c: In function 'setup_arch':
arch/x86/kernel/setup.c:916:6: error: implicit declaration of function 'acpi_mps_check' [-Werror=implicit-function-declaration]
  916 |  if (acpi_mps_check()) {
      |      ^~~~~~~~~~~~~~
arch/x86/kernel/setup.c:1110:2: error: implicit declaration of function 'acpi_table_upgrade' [-Werror=implicit-function-declaration]
 1110 |  acpi_table_upgrade();
      |  ^~~~~~~~~~~~~~~~~~
arch/x86/kernel/setup.c:1112:2: error: implicit declaration of function 'acpi_boot_table_init' [-Werror=implicit-function-declaration]
 1112 |  acpi_boot_table_init();
      |  ^~~~~~~~~~~~~~~~~~~~
arch/x86/kernel/setup.c:1120:2: error: implicit declaration of function 'early_acpi_boot_init'; did you mean 'early_cpu_init'? [-Werror=implicit-function-declaration]
 1120 |  early_acpi_boot_init();
      |  ^~~~~~~~~~~~~~~~~~~~
      |  early_cpu_init
arch/x86/kernel/setup.c:1162:2: error: implicit declaration of function 'acpi_boot_init' [-Werror=implicit-function-declaration]
 1162 |  acpi_boot_init();
      |  ^~~~~~~~~~~~~~

Caused by commit

  342f43af70db ("iscsi_ibft: fix crash due to KASLR physical memory remapping")

Unfortunately that commit has now been merged into Linus' tree as well.

I have added the following fix patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 1 Sep 2021 16:31:32 +1000
Subject: [PATCH] x86: include acpi.h when using acpi functions

The removal of the include of linux/acpi.h from include/linux/iscsi_ibft.h
by commit

  342f43af70db ("iscsi_ibft: fix crash due to KASLR physical memory remapping")

exposed this build failure.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/setup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63b20536c8d2..da0a4b64880f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -13,6 +13,7 @@
 #include <linux/init_ohci1394_dma.h>
 #include <linux/initrd.h>
 #include <linux/iscsi_ibft.h>
+#include <linux/acpi.h>
 #include <linux/memblock.h>
 #include <linux/panic_notifier.h>
 #include <linux/pci.h>
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgp_zvIKZGgUt.pgp
Description: OpenPGP digital signature