diff options
author | Anton Blanchard <anton@samba.org> | 2011-08-14 10:30:30 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 19:20:00 -0400 |
commit | 9c740025c51a26ab00192cfc464064d4ccbfe3fc (patch) | |
tree | 05ee46330103200ba7db76a8267186770e8ce5fa | |
parent | 0330581ab3b9002d55ee66f377ccbbb742175c01 (diff) |
powerpc/pseries: Avoid spurious error during hotplug CPU add
During hotplug CPU add we get the following error:
Unexpected Error (0) returned from configure-connector
ibm,configure-connector returns 0 for configuration complete, so
catch this and avoid the error.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: <stable@kernel.org>
-rw-r--r-- | arch/powerpc/platforms/pseries/dlpar.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index e9be25bc571b..0f1b706506ed 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c | |||
@@ -112,6 +112,7 @@ void dlpar_free_cc_nodes(struct device_node *dn) | |||
112 | dlpar_free_one_cc_node(dn); | 112 | dlpar_free_one_cc_node(dn); |
113 | } | 113 | } |
114 | 114 | ||
115 | #define COMPLETE 0 | ||
115 | #define NEXT_SIBLING 1 | 116 | #define NEXT_SIBLING 1 |
116 | #define NEXT_CHILD 2 | 117 | #define NEXT_CHILD 2 |
117 | #define NEXT_PROPERTY 3 | 118 | #define NEXT_PROPERTY 3 |
@@ -158,6 +159,9 @@ struct device_node *dlpar_configure_connector(u32 drc_index) | |||
158 | spin_unlock(&rtas_data_buf_lock); | 159 | spin_unlock(&rtas_data_buf_lock); |
159 | 160 | ||
160 | switch (rc) { | 161 | switch (rc) { |
162 | case COMPLETE: | ||
163 | break; | ||
164 | |||
161 | case NEXT_SIBLING: | 165 | case NEXT_SIBLING: |
162 | dn = dlpar_parse_cc_node(ccwa); | 166 | dn = dlpar_parse_cc_node(ccwa); |
163 | if (!dn) | 167 | if (!dn) |