From 3a24428e7c7937177bcc93b4066d92685dde6499 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 27 Sep 2010 23:33:29 +0200
Subject: [PATCH] --- yaml --- r: 217337 b: refs/heads/master c:
 898e70d1e526d7814bd2f64c907706b83ffca9af h: refs/heads/master i:   217335:
 c5ca7dc9382648253581fb2254429b3edca94cc9 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory-failure.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a5bda5fc8bea..21ba1727aa8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb46e73520940bfc426152cfe5e4a9f1ae3f00b6
+refs/heads/master: 898e70d1e526d7814bd2f64c907706b83ffca9af
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 0a2ed9a17e8c..77b3e79528f0 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -35,7 +35,6 @@
  * - kcore/oldmem/vmcore/mem/kmem check for hwpoison pages
  * - pass bad pages to kdump next kernel
  */
-#define DEBUG 1		/* remove me in 2.6.34 */
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/page-flags.h>