From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 15 Jul 2008 20:22:49 +0000 (-0700)
Subject: generic ipi function calls: wait on alloc failure fallback
X-Git-Tag: v2.6.27-rc1~1068
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63cf13b77ab785e87c867defa8545e6d4a989774;p=linux-2.6

generic ipi function calls: wait on alloc failure fallback

When a GFP_ATOMIC allocation fails, it falls back to allocating the
data on the stack and converting it to a waiting call.

Make sure we actually wait in this case.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/smp.c b/kernel/smp.c
index ab10793b07..462c785ca1 100644
--- 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);