linux-next: slab/percpu tree build failure

linux-next: slab/percpu tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

mm/slub.c: In function 'alloc_kmem_cache_cpus':
mm/slub.c:2074: error: implicit declaration of function 'per_cpu_var'
mm/slub.c:2074: warning: assignment makes pointer from integer without a cast

Caused by commit 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 ("SLUB: Use
this_cpu operations in slub") from the slab interacting with commit
dd17c8f72993f9461e9c19250e3f155d6d99df22 ("percpu: remove per_cpu__
prefix") from the percpu tree.

I have added the following patch for today and (can carry it as
necessary).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Dec 2009 09:56:29 +1100
Subject: [PATCH] slab: update for percpu API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 mm/slub.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index 6e34309..9e86e6b 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2071,7 +2071,7 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s, gfp_t flags)
 		 * Boot time creation of the kmalloc array. Use static per cpu data
 		 * since the per cpu allocator is not available yet.
 		 */
-		s->cpu_slab = per_cpu_var(kmalloc_percpu) + (s - kmalloc_caches);
+		s->cpu_slab = kmalloc_percpu + (s - kmalloc_caches);
 	else
 		s->cpu_slab =  alloc_percpu(struct kmem_cache_cpu);
 
-- 
1.6.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: slab/percpu tree build failure

[Pekka Enberg]

Hi Stephen,

On Thu, 2009-12-24 at 09:58 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> mm/slub.c: In function 'alloc_kmem_cache_cpus':
> mm/slub.c:2074: error: implicit declaration of function 'per_cpu_var'
> mm/slub.c:2074: warning: assignment makes pointer from integer without a cast
> 
> Caused by commit 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 ("SLUB: Use
> this_cpu operations in slub") from the slab interacting with commit
> dd17c8f72993f9461e9c19250e3f155d6d99df22 ("percpu: remove per_cpu__
> prefix") from the percpu tree.
> 
> I have added the following patch for today and (can carry it as
> necessary).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 24 Dec 2009 09:56:29 +1100
> Subject: [PATCH] slab: update for percpu API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  mm/slub.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mm/slub.c b/mm/slub.c
> index 6e34309..9e86e6b 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -2071,7 +2071,7 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s, gfp_t flags)
>  		 * Boot time creation of the kmalloc array. Use static per cpu data
>  		 * since the per cpu allocator is not available yet.
>  		 */
> -		s->cpu_slab = per_cpu_var(kmalloc_percpu) + (s - kmalloc_caches);
> +		s->cpu_slab = kmalloc_percpu + (s - kmalloc_caches);
>  	else
>  		s->cpu_slab =  alloc_percpu(struct kmem_cache_cpu);

Looks good to me, thanks! I guess you should carry it in linux-next so
that I don't need to pull percpu.git in slab.git?

			Pekka

Re: linux-next: slab/percpu tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

Hi Pekka,

On Mon, 28 Dec 2009 09:42:43 +0200 Pekka Enberg <penberg@cs.helsinki.fi> wrote:
>
> Looks good to me, thanks! I guess you should carry it in linux-next so
> that I don't need to pull percpu.git in slab.git?

That's the plan.  Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]