From: Alex Chiang Date: Thu, 25 Feb 2010 21:09:52 +0000 (-0700) Subject: [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI X-Git-Tag: v2.6.34-rc1~238^2~1^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d868080d2a1c95526cb01e3d0c14096721cbb87a;p=pandora-kernel.git [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI The following commit broke the ia64 sim_defconfig build: 3b2b84c0b81108a9a869a88bf2beeb5a95d81dd1 ACPI: processor: driver doesn't need to evaluate _PDC This is because it added: +#include To arch/ia64/kernel/acpi.c. Unfortunately, the ia64_simdefconfig does not turn on CONFIG_ACPI, and we get build errors. The fix described in $subject seems to be the most sensible way to untangle the mess. The other issue is that acpi_get_sysname() is required for all configs, most of which define CONFIG_ACPI, but are not CONFIG_IA64_GENERIC. Turn it into an inline to cover the "non generic" ia64 configs; to prevent a duplicate definition build error, we need to wrap the definition in acpi.o inside an #ifdef. Finally, move the pm_idle and pm_power_off exports into process.c (which is always built), similar to other architectures, and allow the sim defconfig to link. Signed-off-by: Alex Chiang Signed-off-by: Tony Luck --- Reading git-diff-tree failed