Stephen Rothwell 1154fab73c SLUB: Fix per-cpu merge conflict
The slab tree adds a percpu variable usage case (commit
9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 "SLUB: Use this_cpu operations in
slub"), but the percpu tree removes the prefixing of percpu variables (commit
dd17c8f72993f9461e9c19250e3f155d6d99df22 "percpu: remove per_cpu__ prefix"),
thus causing the following compilation error:

    CC      mm/slub.o
  mm/slub.c: In function ‘alloc_kmem_cache_cpus’:
  mm/slub.c:2078: error: implicit declaration of function ‘per_cpu_var’
  mm/slub.c:2078: warning: assignment makes pointer from integer without a cast
  make[1]: *** [mm/slub.o] Error 1

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
2010-03-04 12:09:43 +02:00
..
2009-12-03 13:49:43 +01:00
2009-04-01 08:59:13 -07:00
2009-06-16 19:47:28 -07:00
2009-12-15 08:53:20 -08:00
2009-09-22 07:17:35 -07:00
2009-12-30 12:23:27 -08:00
2009-12-15 08:53:16 -08:00
2010-02-26 08:25:35 +01:00
2009-12-17 15:45:32 -08:00
2009-12-16 19:48:48 -05:00
2010-03-04 12:09:43 +02:00
2010-03-01 17:59:24 -08:00
2009-12-15 08:53:19 -08:00
2009-06-23 12:50:05 -07:00
2010-01-13 16:09:33 -08:00
2010-01-05 15:34:51 +09:00