From 47226ea2a0db0faa40fc05e4575af3931d8ff8a3 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 16 Dec 2009 12:20:00 +0100
Subject: [PATCH] --- yaml --- r: 177638 b: refs/heads/master c:
 2326c467df4ff814dc07cf1bdaa1e6e0a9c9f21c h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/mm/memory-failure.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eac547fc458e..23105c651aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0474a60ec704324577782b1057d05b574388d552
+refs/heads/master: 2326c467df4ff814dc07cf1bdaa1e6e0a9c9f21c
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index ded1d387b4c5..b5c3b6bd511f 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -749,6 +749,19 @@ static struct page_state {
 	{ 0,		0,		"unknown page state",	me_unknown },
 };
 
+#undef dirty
+#undef sc
+#undef unevict
+#undef mlock
+#undef writeback
+#undef lru
+#undef swapbacked
+#undef head
+#undef tail
+#undef compound
+#undef slab
+#undef reserved
+
 static void action_result(unsigned long pfn, char *msg, int result)
 {
 	struct page *page = pfn_to_page(pfn);