diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-10-10 05:44:33 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-12 19:56:19 -0400 |
commit | 78b5b626fa9048337530cc3ba4ceb9e4ee96a386 (patch) | |
tree | 3f6fc0302ddd031f82d251318a2aa73e3785f451 /arch/powerpc | |
parent | 6070bf6afe4c4232ec1e04fa16c056758b2e681b (diff) |
powerpc: Make ppc32 respect the boot cpu id for !CONFIG_SMP
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/smp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index c092f84302fd..1866cec4f967 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); | |||
93 | 93 | ||
94 | #else | 94 | #else |
95 | /* for UP */ | 95 | /* for UP */ |
96 | #define hard_smp_processor_id() 0 | 96 | #define hard_smp_processor_id() get_hard_smp_processor_id(0) |
97 | #define smp_setup_cpu_maps() | 97 | #define smp_setup_cpu_maps() |
98 | 98 | ||
99 | #endif /* CONFIG_SMP */ | 99 | #endif /* CONFIG_SMP */ |
@@ -122,6 +122,7 @@ static inline int get_hard_smp_processor_id(int cpu) | |||
122 | 122 | ||
123 | static inline void set_hard_smp_processor_id(int cpu, int phys) | 123 | static inline void set_hard_smp_processor_id(int cpu, int phys) |
124 | { | 124 | { |
125 | boot_cpuid_phys = phys; | ||
125 | } | 126 | } |
126 | #endif /* !CONFIG_SMP */ | 127 | #endif /* !CONFIG_SMP */ |
127 | #endif /* !CONFIG_PPC64 */ | 128 | #endif /* !CONFIG_PPC64 */ |