From bd73ac2dac4c658c17c432e5ac81c1313057d3c1 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Mon, 21 Nov 2005 21:32:14 -0800
Subject: [PATCH] --- yaml --- r: 14606 b: refs/heads/master c:
 664beed0190fae687ac51295694004902ddeb18e h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/mm.h         | 19 -------------------
 trunk/include/linux/page-flags.h |  4 ----
 trunk/mm/page_alloc.c            |  5 -----
 trunk/mm/swap.c                  |  3 ---
 5 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 0846a291b604..e9d4bcddc7ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cdca61bf8537043edde8ef784ce1a1351361dac
+refs/heads/master: 664beed0190fae687ac51295694004902ddeb18e
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 0986d19be0b7..9701210c6680 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -311,8 +311,6 @@ struct page {
 
 extern void FASTCALL(__page_cache_release(struct page *));
 
-#ifdef CONFIG_HUGETLB_PAGE
-
 static inline int page_count(struct page *page)
 {
 	if (PageCompound(page))
@@ -329,23 +327,6 @@ static inline void get_page(struct page *page)
 
 void put_page(struct page *page);
 
-#else		/* CONFIG_HUGETLB_PAGE */
-
-#define page_count(p)		(atomic_read(&(p)->_count) + 1)
-
-static inline void get_page(struct page *page)
-{
-	atomic_inc(&page->_count);
-}
-
-static inline void put_page(struct page *page)
-{
-	if (put_page_testzero(page))
-		__page_cache_release(page);
-}
-
-#endif		/* CONFIG_HUGETLB_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 --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index f34767c5fc79..343083fec258 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -287,11 +287,7 @@ extern void __mod_page_state(unsigned long offset, unsigned long delta);
 #define ClearPageReclaim(page)	clear_bit(PG_reclaim, &(page)->flags)
 #define TestClearPageReclaim(page) test_and_clear_bit(PG_reclaim, &(page)->flags)
 
-#ifdef CONFIG_HUGETLB_PAGE
 #define PageCompound(page)	test_bit(PG_compound, &(page)->flags)
-#else
-#define PageCompound(page)	0
-#endif
 #define SetPageCompound(page)	set_bit(PG_compound, &(page)->flags)
 #define ClearPageCompound(page)	clear_bit(PG_compound, &(page)->flags)
 
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index bd4de592dc23..23b84c4e1a57 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -148,10 +148,6 @@ static void bad_page(const char *function, struct page *page)
 	add_taint(TAINT_BAD_PAGE);
 }
 
-#ifndef CONFIG_HUGETLB_PAGE
-#define prep_compound_page(page, order) do { } while (0)
-#define destroy_compound_page(page, order) do { } while (0)
-#else
 /*
  * Higher-order pages are called "compound pages".  They are structured thusly:
  *
@@ -205,7 +201,6 @@ static void destroy_compound_page(struct page *page, unsigned long order)
 		ClearPageCompound(p);
 	}
 }
-#endif		/* CONFIG_HUGETLB_PAGE */
 
 /*
  * function for dealing with page's order in buddy system.
diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c
index d09cf7f03e76..73d351439ef6 100644
--- a/trunk/mm/swap.c
+++ b/trunk/mm/swap.c
@@ -34,8 +34,6 @@
 /* How many pages do we try to swap or page in/out together? */
 int page_cluster;
 
-#ifdef CONFIG_HUGETLB_PAGE
-
 void put_page(struct page *page)
 {
 	if (unlikely(PageCompound(page))) {
@@ -52,7 +50,6 @@ void put_page(struct page *page)
 		__page_cache_release(page);
 }
 EXPORT_SYMBOL(put_page);
-#endif
 
 /*
  * Writeback is about to end against a page which has been marked for immediate