From 2326c467df4ff814dc07cf1bdaa1e6e0a9c9f21c Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 16 Dec 2009 12:20:00 +0100
Subject: [PATCH] HWPOISON: Undefine short-hand macros after use to avoid
 namespace conflict

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 mm/memory-failure.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ded1d387b4c..b5c3b6bd511 100644
--- a/mm/memory-failure.c
+++ b/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);