diff options
| author | Tyrel Datwyler | 2013-08-15 07:23:52 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2013-08-27 06:45:16 +0200 |
| commit | 5935ff4343a689fbb382d64408bc6955c6589830 (patch) | |
| tree | 4f56074bb231126945315d94e2ad68b03a1ca1fa /arch/powerpc | |
| parent | powerpc/pseries: Add mising of_node_put in delete_dt_node (diff) | |
| download | kernel-qcow2-linux-5935ff4343a689fbb382d64408bc6955c6589830.tar.gz kernel-qcow2-linux-5935ff4343a689fbb382d64408bc6955c6589830.tar.xz kernel-qcow2-linux-5935ff4343a689fbb382d64408bc6955c6589830.zip | |
powerpc/pseries: Child nodes are not detached by dlpar_detach_node
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/pseries/dlpar.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 4ea667d2b0f3..7cfdaae1721a 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -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; |