1 files changed, 8 insertions, 2 deletions

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 93577abae36d..97579348a549 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -577,7 +577,8 @@ void __init sn_cpu_init(void)
         int i;
         static int wars_have_been_checked;
 
-        if (smp_processor_id() == 0 && IS_MEDUSA()) {
+        cpuid = smp_processor_id();
+        if (cpuid == 0 && IS_MEDUSA()) {
                 if (ia64_sn_is_fake_prom())
                         sn_prom_type = 2;
                 else
@@ -597,6 +598,12 @@ void __init sn_cpu_init(void)
         sn_hub_info->as_shift = sn_hub_info->nasid_shift - 2;
 
         /*
+         * Don't check status. The SAL call is not supported on all PROMs
+         * but a failure is harmless.
+         */
+        (void) ia64_sn_set_cpu_number(cpuid);
+
+        /*
          * The boot cpu makes this call again after platform initialization is
          * complete.
          */
@@ -607,7 +614,6 @@ void __init sn_cpu_init(void)
                 if (ia64_sn_get_prom_feature_set(i, &sn_prom_features[i]) != 0)
                         break;
 
-        cpuid = smp_processor_id();
         cpuphyid = get_sapicid();
 
         if (ia64_sn_get_sapic_info(cpuphyid, &nasid, &subnode, &slice))