---

yaml --- r: 177638 b: refs/heads/master c: 2326c46 h: refs/heads/master v: v3
git-mirror · Dec 16, 2009 · 47226ea · 47226ea
1 parent bff941f
commit 47226ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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);