diff --git a/[refs] b/[refs] index 17eec2aa4b12..b2eda2963d17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30e9656cc340035e102fea46e1908689494b042d +refs/heads/master: 9934a7939e1cdce62ece9ef7d25ebb3c55547fac diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 1c240c4b71d9..a1f42bdc0245 100644 --- a/trunk/mm/slob.c +++ b/trunk/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);