Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'

[sfrench/cifs-2.6.git] / kernel / smpboot.c

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index f6bc0bc8a2aab322c0f6e89f1d53a4302878e438..b9f54544e7499bb068a809436dbc1e1913f1a3ce 100644 (file)
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -392,6 +392,13 @@ int cpu_check_up_prepare(int cpu)
                 */
                return -EAGAIN;
 
+       case CPU_UP_PREPARE:
+               /*
+                * Timeout while waiting for the CPU to show up. Allow to try
+                * again later.
+                */
+               return 0;
+
        default:
 
                /* Should not happen.  Famous last words. */