aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r--arch/powerpc/kernel/prom.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index ab9b291dda54..6309a1a17c4a 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1110,22 +1110,22 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
1110 } 1110 }
1111#endif 1111#endif
1112 1112
1113#ifdef CONFIG_PPC64 1113 boot_cpuid = 0;
1114 boot_cpuid_phys = 0;
1114 if (initial_boot_params && initial_boot_params->version >= 2) { 1115 if (initial_boot_params && initial_boot_params->version >= 2) {
1115 /* version 2 of the kexec param format adds the phys cpuid 1116 /* version 2 of the kexec param format adds the phys cpuid
1116 * of booted proc. 1117 * of booted proc.
1117 */ 1118 */
1118 boot_cpuid_phys = initial_boot_params->boot_cpuid_phys; 1119 boot_cpuid_phys = initial_boot_params->boot_cpuid_phys;
1119 boot_cpuid = 0;
1120 } else { 1120 } else {
1121 /* Check if it's the boot-cpu, set it's hw index in paca now */ 1121 /* Check if it's the boot-cpu, set it's hw index now */
1122 if (get_flat_dt_prop(node, "linux,boot-cpu", NULL) != NULL) { 1122 if (get_flat_dt_prop(node, "linux,boot-cpu", NULL) != NULL) {
1123 prop = get_flat_dt_prop(node, "reg", NULL); 1123 prop = get_flat_dt_prop(node, "reg", NULL);
1124 set_hard_smp_processor_id(0, prop == NULL ? 0 : *prop); 1124 if (prop != NULL)
1125 boot_cpuid_phys = get_hard_smp_processor_id(0); 1125 boot_cpuid_phys = *prop;
1126 } 1126 }
1127 } 1127 }
1128#endif 1128 set_hard_smp_processor_id(0, boot_cpuid_phys);
1129 1129
1130#ifdef CONFIG_ALTIVEC 1130#ifdef CONFIG_ALTIVEC
1131 /* Check if we have a VMX and eventually update CPU features */ 1131 /* Check if we have a VMX and eventually update CPU features */