diff options
| author | Anton Blanchard <anton@samba.org> | 2011-08-14 14:30:30 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:37:10 -0800 |
| commit | 747613961425127da9e14e020500b184d4f7a42c (patch) | |
| tree | 20281c1591ada653853288b8ca2775af6ff1787a /arch/powerpc | |
| parent | 55a6bcf9d9a66921b7a7a854ca86356e901114fe (diff) | |
| download | kernel_samsung_smdk4412-747613961425127da9e14e020500b184d4f7a42c.tar.gz kernel_samsung_smdk4412-747613961425127da9e14e020500b184d4f7a42c.tar.bz2 kernel_samsung_smdk4412-747613961425127da9e14e020500b184d4f7a42c.zip | |
powerpc/pseries: Avoid spurious error during hotplug CPU add
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>
Diffstat (limited to 'arch/powerpc')
| -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 57ceb92b228..82766e5a79e 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) 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_connector(u32 drc_index) spin_unlock(&rtas_data_buf_lock); switch (rc) { + case COMPLETE: + break; + case NEXT_SIBLING: dn = dlpar_parse_cc_node(ccwa); if (!dn) |