Commit adaa765d authored May 31, 2005 by Alexander Nyberg Committed by Linus Torvalds May 31, 2005

[PATCH] acpi build fix: x86 setup.c



This is a neverending story

linux/acpi.h contains empty declarations for acpi_boot_init() &
acpi_boot_table_init() but they are nested inside #ifdef CONFIG_ACPI.

So we'll have to #ifdef in arch/i386/kernel/setup.c: setup_arch()

Signed-off-by: Alexander Nyberg <alexn@telia.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 9c2be6a0

arch/i386/kernel/setup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1502,11 +1502,13 @@ void __init setup_arch(char **cmdline_p)
		if (efi_enabled)
		efi_map_memmap();

		#ifdef CONFIG_ACPI_BOOT
		/*
		* Parse the ACPI tables for possible boot-time SMP configuration.
		*/
		acpi_boot_table_init();
		acpi_boot_init();
		#endif

		#ifdef CONFIG_X86_LOCAL_APIC
		if (smp_found_config)

Admin message