Hi all, Today's linux-next merge of the percpu tree got a conflict in mm/slab.c between commit ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 ("SLAB: Fix lockdep annotations for CPU hotplug") from the slab tree and commit 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make percpu symbols under kernel/ and mm/ unique") from the percpu tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc mm/slab.c index 6ad48a7,211b174..0000000 --- a/mm/slab.c +++ b/mm/slab.c @@@ -697,7 -665,27 +697,7 @@@ static inline void init_lock_keys(void static DEFINE_MUTEX(cache_chain_mutex); static struct list_head cache_chain; - static DEFINE_PER_CPU(struct delayed_work, reap_work); -/* - * chicken and egg problem: delay the per-cpu array allocation - * until the general caches are up. - */ -static enum { - NONE, - PARTIAL_AC, - PARTIAL_L3, - EARLY, - FULL -} g_cpucache_up; - -/* - * used by boot code to determine if it can use slab based allocator - */ -int slab_is_available(void) -{ - return g_cpucache_up >= EARLY; -} - + static DEFINE_PER_CPU(struct delayed_work, slab_reap_work); static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep) { -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html