Patchwork powerpc: Make ppc32 actually respect the boot cpu id for !CONFIG_SMP

login
register
mail settings
Submitter Kumar Gala
Date Oct. 10, 2008, 4:13 a.m.
Message ID <1223612036-13409-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/3683/
State Superseded
Headers show

Comments

Kumar Gala - Oct. 10, 2008, 4:13 a.m.
Previosly 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>
---
 arch/powerpc/include/asm/smp.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index c092f84..db259be 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -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 = cpu;
 }
 #endif /* !CONFIG_SMP */
 #endif /* !CONFIG_PPC64 */