Skip to content

Commit ea7b424

Browse files
nathanchancetorvalds
authored andcommitted
x86/setup: Explicitly include acpi.h
After commit 342f43a ("iscsi_ibft: fix crash due to KASLR physical memory remapping") x86_64_defconfig shows the following errors: arch/x86/kernel/setup.c: In function ‘setup_arch’: arch/x86/kernel/setup.c:916:13: error: implicit declaration of function ‘acpi_mps_check’ [-Werror=implicit-function-declaration] 916 | if (acpi_mps_check()) { | ^~~~~~~~~~~~~~ arch/x86/kernel/setup.c:1110:9: error: implicit declaration of function ‘acpi_table_upgrade’ [-Werror=implicit-function-declaration] 1110 | acpi_table_upgrade(); | ^~~~~~~~~~~~~~~~~~ [... more acpi noise ...] acpi.h was being implicitly included from iscsi_ibft.h in this configuration so the removal of that header means these functions have no definition or declaration. In most other configurations, <linux/acpi.h> continued to be included through at least <linux/tboot.h> if CONFIG_INTEL_TXT was enabled, and there were probably other implicit include paths too. Add acpi.h explicitly so there is no more error, and so that we don't continue to depend on these unreliable implicit include paths. Tested-by: Matthieu Baerts <[email protected]> Signed-off-by: Nathan Chancellor <[email protected]> Cc: Maurizio Lombardi <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 07281a2 commit ea7b424

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/x86/kernel/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* This file contains the setup_arch() code, which handles the architecture-dependent
66
* parts of early kernel initialization.
77
*/
8+
#include <linux/acpi.h>
89
#include <linux/console.h>
910
#include <linux/crash_dump.h>
1011
#include <linux/dma-map-ops.h>

0 commit comments

Comments
 (0)