Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / kernel / smp.c

diff --git a/kernel/smp.c b/kernel/smp.c
index ab10793b0707d6ced7f0d4fe91328200d747bbfd..462c785ca1eee80dea958541edf19786259c88e6 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -312,6 +312,7 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
        if (!data) {
                data = &d;
                data->csd.flags = CSD_FLAG_WAIT;
+               wait = 1;
        }
 
        spin_lock_init(&data->lock);