Subject: linux-next: manual merge of the tip tree with the slab tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 16 Jun 2009 15:46:52 +1000

Hi all,

Today's linux-next merge of the tip tree got a conflict in mm/slub.c
between commit 964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 ("SLUB: Fix early
boot GFP_DMA allocations") from the slab tree and commit
18fd427debcf37c06917b55295df682fd05fee76 ("slub: add hooks for
kmemcheck") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc mm/slub.c
index 3976098,73fb7d1..0000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -2700,18 -2657,10 +2726,18 @@@ static noinline struct kmem_cache *dma_
  			 (unsigned int)realsize);
  	s = kmalloc(kmem_size, flags & ~SLUB_DMA);
  
 +	/*
 +	 * Must defer sysfs creation to a workqueue because we don't know
 +	 * what context we are called from. Before sysfs comes up, we don't
 +	 * need to do anything because our sysfs initcall will start by
 +	 * adding all existing slabs to sysfs.
 +	 */
- 	slabflags = SLAB_CACHE_DMA;
++	slabflags = SLAB_CACHE_DMA | SLAB_NOTRACK;
 +	if (slab_state >= SYSFS)
 +		slabflags |= __SYSFS_ADD_DEFERRED;
 +
  	if (!s || !text || !kmem_cache_open(s, flags, text,
 -			realsize, ARCH_KMALLOC_MINALIGN,
 -			SLAB_CACHE_DMA|SLAB_NOTRACK|__SYSFS_ADD_DEFERRED,
 -			NULL)) {
 +			realsize, ARCH_KMALLOC_MINALIGN, slabflags, NULL)) {
  		kfree(s);
  		kfree(text);
  		goto unlock_out;