[PATCH] powerpc: merge code values for identifying platforms

[firefly-linux-kernel-4.4.55.git] / arch / ppc64 / kernel / lparcfg.c

diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c
index e86155770bbc5ff761352dfc556b7c146295e77d..a80ed307515c12dc045377c0670f0f1528f1fae0 100644 (file)
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
@@ -35,6 +35,7 @@
 #include <asm/time.h>
 #include <asm/iseries/it_exp_vpd_panel.h>
 #include <asm/prom.h>
+#include <asm/systemcfg.h>
 
 #define MODULE_VERS "1.6"
 #define MODULE_NAME "lparcfg"
@@ -371,7 +372,7 @@ static int lparcfg_data(struct seq_file *m, void *v)
        lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity", NULL);
 
        if (lrdrp == NULL) {
-               partition_potential_processors = systemcfg->processorCount;
+               partition_potential_processors = _systemcfg->processorCount;
        } else {
                partition_potential_processors = *(lrdrp + 4);
        }
@@ -599,9 +600,7 @@ int __init lparcfg_init(void)
 void __exit lparcfg_cleanup(void)
 {
        if (proc_ppc64_lparcfg) {
-               if (proc_ppc64_lparcfg->data) {
-                       kfree(proc_ppc64_lparcfg->data);
-               }
+               kfree(proc_ppc64_lparcfg->data);
                remove_proc_entry("lparcfg", proc_ppc64_lparcfg->parent);
        }
 }