From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Mar 2010 05:04:45 +0000 (+1100)
Subject: SLUB: Fix per-cpu merge conflict
X-Git-Tag: v2.6.34-rc1~189^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1154fab73ccbab010cfaa272b6987c624cfd63c6;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed