From a802f23db01e5ddbd32364babd6bcf6f867bcdb1 Mon Sep 17 00:00:00 2001
From: Michel Lespinasse <walken@google.com>
Date: Mon, 8 Oct 2012 16:29:34 -0700
Subject: [PATCH] --- yaml --- r: 332361 b: refs/heads/master c:
 db971418824381d3583c73751181fec76c743bf6 h: refs/heads/master i:   332359:
 3fcec9440cd14dc835ca20cf7edcfea6c0cf1256 v: v3

---
 [refs]              | 2 +-
 trunk/mm/internal.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd3f6119ab63..c0bc1426647b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d3a551c28c6669dc43be40d8fafafbc2ec8f42b
+refs/heads/master: db971418824381d3583c73751181fec76c743bf6
diff --git a/trunk/mm/internal.h b/trunk/mm/internal.h
index e549a7fbc296..bbd7b34db4ea 100644
--- a/trunk/mm/internal.h
+++ b/trunk/mm/internal.h
@@ -341,7 +341,6 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
 #define ZONE_RECLAIM_FULL	-1
 #define ZONE_RECLAIM_SOME	0
 #define ZONE_RECLAIM_SUCCESS	1
-#endif
 
 extern int hwpoison_filter(struct page *p);
 
@@ -357,3 +356,5 @@ extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
         unsigned long, unsigned long);
 
 extern void set_pageblock_order(void);
+
+#endif	/* __MM_INTERNAL_H */