aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup-common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r--arch/powerpc/kernel/setup-common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 640ff0d8f83c..3c8847b647fa 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -352,11 +352,12 @@ void __init smp_setup_cpu_maps(void)
352 const int *intserv; 352 const int *intserv;
353 int j, len = sizeof(u32), nthreads = 1; 353 int j, len = sizeof(u32), nthreads = 1;
354 354
355 intserv = get_property(dn, "ibm,ppc-interrupt-server#s", &len); 355 intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s",
356 &len);
356 if (intserv) 357 if (intserv)
357 nthreads = len / sizeof(int); 358 nthreads = len / sizeof(int);
358 else { 359 else {
359 intserv = get_property(dn, "reg", NULL); 360 intserv = of_get_property(dn, "reg", NULL);
360 if (!intserv) 361 if (!intserv)
361 intserv = &cpu; /* assume logical == phys */ 362 intserv = &cpu; /* assume logical == phys */
362 } 363 }
@@ -382,7 +383,7 @@ void __init smp_setup_cpu_maps(void)
382 num_addr_cell = of_n_addr_cells(dn); 383 num_addr_cell = of_n_addr_cells(dn);
383 num_size_cell = of_n_size_cells(dn); 384 num_size_cell = of_n_size_cells(dn);
384 385
385 ireg = get_property(dn, "ibm,lrdr-capacity", NULL); 386 ireg = of_get_property(dn, "ibm,lrdr-capacity", NULL);
386 387
387 if (!ireg) 388 if (!ireg)
388 goto out; 389 goto out;