From 45de7982a29f0e87d1675c9e458ec9126a5bfc29 Mon Sep 17 00:00:00 2001
From: Tero Roponen <tero.roponen@gmail.com>
Date: Wed, 1 Dec 2010 20:04:20 +0200
Subject: [PATCH] --- yaml --- r: 227691 b: refs/heads/master c:
 8165984acf825917437debae519209073c32a5a7 h: refs/heads/master i:   227689:
 c3e3e6393a1828dce0385baf4a4573cf84c5d4cb   227687:
 ad25efa919ee5545fac1dbc812af07cf57b1d824 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 51438f739a22..cb0ac408faf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85beb5869a4f6abb52a7cf8e01de6fa57e9ee47d
+refs/heads/master: 8165984acf825917437debae519209073c32a5a7
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 7796a0446b3f..48d82a55f4b6 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3417,13 +3417,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page,
 
 	for_each_free_object(p, s, page->freelist) {
 		set_bit(slab_index(p, s, addr), map);
-		if (!check_object(s, page, p, 0))
+		if (!check_object(s, page, p, SLUB_RED_INACTIVE))
 			return 0;
 	}
 
 	for_each_object(p, s, addr, page->objects)
 		if (!test_bit(slab_index(p, s, addr), map))
-			if (!check_object(s, page, p, 1))
+			if (!check_object(s, page, p, SLUB_RED_ACTIVE))
 				return 0;
 	return 1;
 }