Subject: linux-next: slab tree build failure

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Jun 2009 14:16:26 +1000

Hi all,

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

mm/slqb.c:75: error: 'SLAB_GFP_BOOT_MASK' undeclared here (not in a function)

Caused by commit df548b0bbaf2d4d16ce52d2f5ccdc1cfded70e06 ("SLQB: Fix
early boot allocations") from the slab tree interacting with commit
dcce284a259373f9e5570f2e33f79eca84fcf565 ("mm: Extend gfp masking to the
page allocator") that entered Linus' tree today.

I have applied this patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Jun 2009 14:13:21 +1000
Subject: [PATCH] slqb: fix for macro name change

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 mm/slqb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/slqb.c b/mm/slqb.c
index b61ad01..4c9051d 100644
--- a/mm/slqb.c
+++ b/mm/slqb.c
@@ -72,7 +72,7 @@ static int slqb_min_objects = 1;
  * The slab allocator is initialized with interrupts disabled. Therefore, make
  * sure early boot allocations don't accidentally enable interrupts.
  */
-static gfp_t slab_gfp_mask __read_mostly = SLAB_GFP_BOOT_MASK;
+static gfp_t slab_gfp_mask __read_mostly = GFP_BOOT_MASK;
 
 #ifdef CONFIG_NUMA
 static inline int slab_numa(struct kmem_cache *s)
-- 
1.6.3.1

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/