commit 2326c467df4ff814dc07cf1bdaa1e6e0a9c9f21c
author Andi Kleen <andi@firstfloor.org> Wed Dec 16 12:20:00 2009 +0100
committer Andi Kleen <ak@linux.intel.com> Wed Dec 16 12:20:00 2009 +0100
tree 7876b43b70a001a8f2d426b77ac6b85d378c7a76
parent 0474a60ec704324577782b1057d05b574388d552

HWPOISON: Undefine short-hand macros after use to avoid namespace conflict

Signed-off-by: Andi Kleen <ak@linux.intel.com>

mm/memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ded1d38..b5c3b6b 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -749,6 +749,19 @@
 	{ 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);