]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc: Make ppc32 respect the boot cpu id for !CONFIG_SMP
authorKumar Gala <galak@kernel.crashing.org>
Fri, 10 Oct 2008 09:44:33 +0000 (09:44 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 12 Oct 2008 23:56:19 +0000 (10:56 +1100)
Previously the FDT header field boot_cpuid_phys wasn't actually used
on ppc32.  Instead the physical boot cpuid was assumed to be 0 for
!CONFIG_SMP.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/smp.h

index c092f84302fd6aa2794aa980b06f03732aec5d8f..1866cec4f9677b5fc995e754cea3ed6936d7ec57 100644 (file)
@@ -93,7 +93,7 @@ extern void __cpu_die(unsigned int cpu);
 
 #else
 /* for UP */
-#define hard_smp_processor_id()                0
+#define hard_smp_processor_id()                get_hard_smp_processor_id(0)
 #define smp_setup_cpu_maps()
 
 #endif /* CONFIG_SMP */
@@ -122,6 +122,7 @@ static inline int get_hard_smp_processor_id(int cpu)
 
 static inline void set_hard_smp_processor_id(int cpu, int phys)
 {
+       boot_cpuid_phys = phys;
 }
 #endif /* !CONFIG_SMP */
 #endif /* !CONFIG_PPC64 */