]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/pseries: Child nodes are not detached by dlpar_detach_node
authorTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Thu, 15 Aug 2013 05:23:52 +0000 (22:23 -0700)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 27 Aug 2013 04:45:16 +0000 (14:45 +1000)
Calls to dlpar_detach_node do not iterate over child nodes detaching them as
well. By iterating and detaching the child nodes we ensure that they have the
OF_DETACHED flag set and that their reference counts are decremented such that
the node will be freed from memory by of_node_release.

Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Acked-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/dlpar.c

index 4ea667d2b0f38a77eb8ff8a3988885d277f0e1b8..7cfdaae1721a925c1d7370515917e7d9af5cc553 100644 (file)
@@ -286,8 +286,15 @@ int dlpar_attach_node(struct device_node *dn)
 
 int dlpar_detach_node(struct device_node *dn)
 {
+       struct device_node *child;
        int rc;
 
+       child = of_get_next_child(dn, NULL);
+       while (child) {
+               dlpar_detach_node(child);
+               child = of_get_next_child(dn, child);
+       }
+
        rc = of_detach_node(dn);
        if (rc)
                return rc;