Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/include/linux/mm.h         |   15 +++++++++++++++
 memhotplug-dave/include/linux/page-flags.h |   22 ++--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff -puN include/linux/mm.h~K7-move-set_page-funcs include/linux/mm.h
--- memhotplug/include/linux/mm.h~K7-move-set_page-funcs	2005-04-13 14:21:05.000000000 -0700
+++ memhotplug-dave/include/linux/mm.h	2005-04-13 14:21:05.000000000 -0700
@@ -351,6 +351,21 @@ static inline void put_page(struct page 
 
 #endif		/* CONFIG_HUGETLB_PAGE */
 
+static inline void set_page_under_capture(struct page *page)
+{
+	SetPageUnderCapture(page);
+}
+
+static inline void clear_page_under_capture(struct page *page)
+{
+	ClearPageUnderCapture(page);
+}
+
+static inline int page_under_capture(struct page *page)
+{
+	return PageUnderCapture(page);
+}
+
 /*
  * Multiple processes may "see" the same page. E.g. for untouched
  * mappings of /dev/null, all processes see the same page full of
diff -puN include/linux/page-flags.h~K7-move-set_page-funcs include/linux/page-flags.h
--- memhotplug/include/linux/page-flags.h~K7-move-set_page-funcs	2005-04-13 14:21:05.000000000 -0700
+++ memhotplug-dave/include/linux/page-flags.h	2005-04-13 14:21:05.000000000 -0700
@@ -336,28 +336,10 @@ static inline void set_page_writeback(st
 #define PageUnderCapture(page)	test_bit(PG_capture, &(page)->flags)
 #define SetPageUnderCapture(page)	set_bit(PG_capture, &(page)->flags)
 #define ClearPageUnderCapture(page)	clear_bit(PG_capture, &(page)->flags)
-
-static inline void set_page_under_capture(struct page *page)
-{
-	SetPageUnderCapture(page);
-}
-
-static inline void clear_page_under_capture(struct page *page)
-{
-	ClearPageUnderCapture(page);
-}
-
-static inline int page_under_capture(struct page *page)
-{
-	return PageUnderCapture(page);
-}
 #else
 #define PageUnderCapture(page)	0
-
-static inline int page_under_capture(struct page *page)
-{
-	return 0;
-}
+#define SetPageUnderCapture(page)	do {} while(0)
+#define ClearPageUnderCapture(page)	do {} while(0)
 #endif
 
 #endif	/* PAGE_FLAGS_H */
_