From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 29 Sep 2006 08:58:34 +0000 (-0700)
Subject: [PATCH] __percpu_alloc_mask() has to be __always_inline in UP case
X-Git-Tag: v2.6.19-rc1~857
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0891a8d706d6e6838a926b6dec42f95581747d0e;p=linux-2.6

[PATCH] __percpu_alloc_mask() has to be __always_inline in UP case

...  or we'll end up with cpu_online_map being evaluated on UP.  In
modules.  cpumask.h is very careful to avoid that, and for a very good
reason.  So should we...

PS: yes, it really triggers (on alpha).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 3835a9642f..46ec72fa2c 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -74,7 +74,7 @@ static inline int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
 	return 0;
 }
 
-static inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
+static __always_inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
 {
 	return kzalloc(size, gfp);
 }