3 files changed, 3 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index b0c3777528a1..d588e48dff74 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -686,7 +686,7 @@ static int pmf_add_functions(struct pmf_device *dev, void *driverdata)
         int count = 0;
 
         for (pp = dev->node->properties; pp != 0; pp = pp->next) {
-                char *name;
+                const char *name;
                 if (strncmp(pp->name, PP_PREFIX, plen) != 0)
                         continue;
                 name = pp->name + plen;
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 39f71fba9b38..2f4668136b20 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -281,12 +281,11 @@ static struct property *new_property(const char *name, const int length,
         if (!new)
                 return NULL;
 
-        if (!(new->name = kmalloc(strlen(name) + 1, GFP_KERNEL)))
+        if (!(new->name = kstrdup(name, GFP_KERNEL)))
                 goto cleanup;
         if (!(new->value = kmalloc(length + 1, GFP_KERNEL)))
                 goto cleanup;
 
-        strcpy(new->name, name);
         memcpy(new->value, value, length);
         *(((char *)new->value) + length) = 0;
         new->length = length;
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index ffb93ae9379b..01b62a62c635 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -136,7 +136,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
         u32 pcicsrbar = 0, pcicsrbar_sz;
         u32 piwar = PIWAR_EN | PIWAR_PF | PIWAR_TGI_LOCAL |
                         PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
-        char *name = hose->dn->full_name;
+        const char *name = hose->dn->full_name;
         const u64 *reg;
         int len;