From e02f9d2d98499cd50f68e2677704e22255ccdcd6 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 31 Oct 2011 17:08:10 -0700
Subject: [PATCH] --- yaml --- r: 272134 b: refs/heads/master c:
 8c5fb8eadde41f67c61a7ac2d3246dab87bf7020 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/mm/debug-pagealloc.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 120a6d732104..7008daa34df0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 798248206b59acc6e1238c778281419c041891a7
+refs/heads/master: 8c5fb8eadde41f67c61a7ac2d3246dab87bf7020
diff --git a/trunk/mm/debug-pagealloc.c b/trunk/mm/debug-pagealloc.c
index a4b6d707a31f..2618933efdb3 100644
--- a/trunk/mm/debug-pagealloc.c
+++ b/trunk/mm/debug-pagealloc.c
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/page-debug-flags.h>
 #include <linux/poison.h>
@@ -64,11 +65,8 @@ static void check_poison_mem(unsigned char *mem, size_t bytes)
 	unsigned char *start;
 	unsigned char *end;
 
-	for (start = mem; start < mem + bytes; start++) {
-		if (*start != PAGE_POISON)
-			break;
-	}
-	if (start == mem + bytes)
+	start = memchr_inv(mem, PAGE_POISON, bytes);
+	if (!start)
 		return;
 
 	for (end = mem + bytes - 1; end > start; end--) {