[IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
authorAlex Chiang <achiang@hp.com>
Thu, 25 Feb 2010 21:09:52 +0000 (14:09 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 25 Feb 2010 23:15:13 +0000 (15:15 -0800)
commitd868080d2a1c95526cb01e3d0c14096721cbb87a
treed87e4a8c2807beb582b20e296ff6dd694172ed18
parent60b341b778cc2929df16c0a504c91621b3c6a4ad
[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 <acpi/processor.h>

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 <achiang@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/include/asm/acpi.h
arch/ia64/kernel/Makefile
arch/ia64/kernel/acpi.c
arch/ia64/kernel/process.c