From patchwork Fri Oct  3 09:32:38 2008
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [08/32] mm: slb: add knowledge of reserve pages
Date: Thu, 02 Oct 2008 23:32:38 -0000
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
X-Patchwork-Id: 2531
Message-Id: <1223026358.28938.2.camel@twins>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
 linux-kernel@vger.kernel.org, linux-mm@kvack.org,
 netdev@vger.kernel.org, trond.myklebust@fys.uio.no,
 Daniel Lezcano <dlezcano@fr.ibm.com>,
 Pekka Enberg <penberg@cs.helsinki.fi>,
 Neil Brown <neilb@suse.de>, David Miller <davem@davemloft.net>

Because I'm a dork and forgot to refresh...

---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Index: linux-2.6/mm/slob.c
===================================================================
--- linux-2.6.orig/mm/slob.c
+++ linux-2.6/mm/slob.c
@@ -239,7 +239,7 @@ static int slob_last(slob_t *s)
 
 static void *slob_new_page(gfp_t gfp, int order, int node)
 {
-	void *page;
+	struct page *page;
 
 #ifdef CONFIG_NUMA
 	if (node != -1)
@@ -318,7 +318,7 @@ static void *slob_alloc(size_t size, gfp
 	slob_t *b = NULL;
 	unsigned long flags;
 
-	if (unlikely(slub_reserve)) {
+	if (unlikely(slob_reserve)) {
 		if (!(gfp_to_alloc_flags(gfp) & ALLOC_NO_WATERMARKS))
 			goto grow;
 	}