[IA64] fix generic/up builds

Jesse Barnes provided the original version of this patch months ago, but
other changes kept conflicting with it, so it got deferred.  Greg Edwards
dug it out of obscurity just over a week ago, and almost immediately
another conflicting patch appeared (Bob Picco's memory-less nodes).

I've resolved the conflicts and got it running again.  CONFIG_SGI_TIOCX
is set to "y" in defconfig, which causes a Tiger to not boot (oops in
tiocx_init).  But that can be resolved later ... get this in now before it
gets stale again.

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index cda06f88c66e..542256e98e60 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -640,9 +640,11 @@ acpi_boot_init (void)
                         if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
                                 node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
         }
-        build_cpu_to_node_map();
 # endif
 #endif
+#ifdef CONFIG_ACPI_NUMA
+        build_cpu_to_node_map();
+#endif
         /* Make boot-up look pretty */
         printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
         return 0;