summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-02-08 10:11:56 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 07:52:58 -0800
commit9934a7939e1cdce62ece9ef7d25ebb3c55547fac (patch)
tree89925b09c257207f4d839c68a4d2f9a764f4c8cc /mm
parent30e9656cc340035e102fea46e1908689494b042d (diff)
downloadtalos-obmc-linux-9934a7939e1cdce62ece9ef7d25ebb3c55547fac.tar.gz
talos-obmc-linux-9934a7939e1cdce62ece9ef7d25ebb3c55547fac.zip
[PATCH] SLOB=y && SMP=y fix
fix CONFIG_SLOB=y (when CONFIG_SMP=y): get rid of the 'align' parameter from its __alloc_percpu() implementation. Boot-tested on x86. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c
index 1c240c4b71d9..a1f42bdc0245 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -336,7 +336,7 @@ EXPORT_SYMBOL(slab_reclaim_pages);
#ifdef CONFIG_SMP
-void *__alloc_percpu(size_t size, size_t align)
+void *__alloc_percpu(size_t size)
{
int i;
struct percpu_data *pdata = kmalloc(sizeof (*pdata), GFP_KERNEL);
OpenPOWER on IntegriCloud