aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/lparcfg.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/lparcfg.c')
-rw-r--r--arch/powerpc/kernel/lparcfg.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 89486b631284..b8dc1eeb0169 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -323,7 +323,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
323 323
324 rtas_node = find_path_device("/rtas"); 324 rtas_node = find_path_device("/rtas");
325 if (rtas_node) 325 if (rtas_node)
326 lrdrp = get_property(rtas_node, "ibm,lrdr-capacity", NULL); 326 lrdrp = of_get_property(rtas_node, "ibm,lrdr-capacity", NULL);
327 327
328 if (lrdrp == NULL) { 328 if (lrdrp == NULL) {
329 partition_potential_processors = vdso_data->processorCount; 329 partition_potential_processors = vdso_data->processorCount;
@@ -539,21 +539,22 @@ static int lparcfg_data(struct seq_file *m, void *v)
539 539
540 rootdn = find_path_device("/"); 540 rootdn = find_path_device("/");
541 if (rootdn) { 541 if (rootdn) {
542 tmp = get_property(rootdn, "model", NULL); 542 tmp = of_get_property(rootdn, "model", NULL);
543 if (tmp) { 543 if (tmp) {
544 model = tmp; 544 model = tmp;
545 /* Skip "IBM," - see platforms/iseries/dt.c */ 545 /* Skip "IBM," - see platforms/iseries/dt.c */
546 if (firmware_has_feature(FW_FEATURE_ISERIES)) 546 if (firmware_has_feature(FW_FEATURE_ISERIES))
547 model += 4; 547 model += 4;
548 } 548 }
549 tmp = get_property(rootdn, "system-id", NULL); 549 tmp = of_get_property(rootdn, "system-id", NULL);
550 if (tmp) { 550 if (tmp) {
551 system_id = tmp; 551 system_id = tmp;
552 /* Skip "IBM," - see platforms/iseries/dt.c */ 552 /* Skip "IBM," - see platforms/iseries/dt.c */
553 if (firmware_has_feature(FW_FEATURE_ISERIES)) 553 if (firmware_has_feature(FW_FEATURE_ISERIES))
554 system_id += 4; 554 system_id += 4;
555 } 555 }
556 lp_index_ptr = get_property(rootdn, "ibm,partition-no", NULL); 556 lp_index_ptr = of_get_property(rootdn, "ibm,partition-no",
557 NULL);
557 if (lp_index_ptr) 558 if (lp_index_ptr)
558 lp_index = *lp_index_ptr; 559 lp_index = *lp_index_ptr;
559 } 560 }