Merge branch 'master'

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1ae96a8ed7e2..e789fef4eb8a 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -341,7 +341,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
         const char *system_id = "";
         unsigned int *lp_index_ptr, lp_index = 0;
         struct device_node *rtas_node;
-        int *lrdrp;
+        int *lrdrp = NULL;
 
         rootdn = find_path_device("/");
         if (rootdn) {
@@ -362,7 +362,9 @@ static int lparcfg_data(struct seq_file *m, void *v)
         seq_printf(m, "partition_id=%d\n", (int)lp_index);
 
         rtas_node = find_path_device("/rtas");
-        lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity", NULL);
+        if (rtas_node)
+                lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity",
+                                            NULL);
 
         if (lrdrp == NULL) {
                 partition_potential_processors = vdso_data->processorCount;