Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / arch / alpha / kernel / process.c

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index f5c5969..06646a2 100644 (file)
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -119,8 +119,8 @@ common_shutdown_1(void *generic_ptr)
 
 #ifdef CONFIG_SMP
        /* Wait for the secondaries to halt. */
-       clear_bit(boot_cpuid, &cpu_present_mask);
-       while (cpu_present_mask)
+       cpu_clear(boot_cpuid, cpu_possible_map);
+       while (cpus_weight(cpu_possible_map))
                barrier();
 #endif
 
@@ -189,7 +189,7 @@ EXPORT_SYMBOL(machine_power_off);
 void
 show_regs(struct pt_regs *regs)
 {
-       dik_show_regs(regs, 0);
+       dik_show_regs(regs, NULL);
 }
 
 /*