| From 9c740025c51a26ab00192cfc464064d4ccbfe3fc Mon Sep 17 00:00:00 2001 |
| From: Anton Blanchard <anton@samba.org> |
| Date: Sun, 14 Aug 2011 14:30:30 +0000 |
| Subject: powerpc/pseries: Avoid spurious error during hotplug CPU add |
| |
| From: Anton Blanchard <anton@samba.org> |
| |
| commit 9c740025c51a26ab00192cfc464064d4ccbfe3fc upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/powerpc/platforms/pseries/dlpar.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- 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_n |
| dlpar_free_one_cc_node(dn); |
| } |
| |
| +#define COMPLETE 0 |
| #define NEXT_SIBLING 1 |
| #define NEXT_CHILD 2 |
| #define NEXT_PROPERTY 3 |
| @@ -158,6 +159,9 @@ struct device_node *dlpar_configure_conn |
| spin_unlock(&rtas_data_buf_lock); |
| |
| switch (rc) { |
| + case COMPLETE: |
| + break; |
| + |
| case NEXT_SIBLING: |
| dn = dlpar_parse_cc_node(ccwa); |
| if (!dn) |
