Patched in Tegra support.

1 files changed, 1 insertions, 57 deletions

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 70473da47b3..e90a673be67 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -6,8 +6,6 @@
 #define PAGE_FLAGS_H
 
 #include <linux/types.h>
-#include <linux/bug.h>
-#include <linux/mmdebug.h>
 #ifndef __GENERATING_BOUNDS_H
 #include <linux/mm_types.h>
 #include <generated/bounds.h>
@@ -362,7 +360,7 @@ static inline void ClearPageCompound(struct page *page)
  * pages on the LRU and/or pagecache.
  */
 TESTPAGEFLAG(Compound, compound)
-__SETPAGEFLAG(Head, compound)  __CLEARPAGEFLAG(Head, compound)
+__PAGEFLAG(Head, compound)
 
 /*
  * PG_reclaim is used in combination with PG_compound to mark the
@@ -374,14 +372,8 @@ __SETPAGEFLAG(Head, compound)  __CLEARPAGEFLAG(Head, compound)
  * PG_compound & PG_reclaim     => Tail page
  * PG_compound & ~PG_reclaim    => Head page
  */
-#define PG_head_mask ((1L << PG_compound))
 #define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim))
 
-static inline int PageHead(struct page *page)
-{
-        return ((page->flags & PG_head_tail_mask) == PG_head_mask);
-}
-
 static inline int PageTail(struct page *page)
 {
         return ((page->flags & PG_head_tail_mask) == PG_head_tail_mask);
@@ -422,26 +414,11 @@ static inline int PageTransHuge(struct page *page)
         return PageHead(page);
 }
 
-/*
- * PageTransCompound returns true for both transparent huge pages
- * and hugetlbfs pages, so it should only be called when it's known
- * that hugetlbfs pages aren't involved.
- */
 static inline int PageTransCompound(struct page *page)
 {
         return PageCompound(page);
 }
 
-/*
- * PageTransTail returns true for both transparent huge pages
- * and hugetlbfs pages, so it should only be called when it's known
- * that hugetlbfs pages aren't involved.
- */
-static inline int PageTransTail(struct page *page)
-{
-        return PageTail(page);
-}
-
 #else
 
 static inline int PageTransHuge(struct page *page)
@@ -453,41 +430,8 @@ static inline int PageTransCompound(struct page *page)
 {
         return 0;
 }
-
-static inline int PageTransTail(struct page *page)
-{
-        return 0;
-}
 #endif
 
-/*
- * If network-based swap is enabled, sl*b must keep track of whether pages
- * were allocated from pfmemalloc reserves.
- */
-static inline int PageSlabPfmemalloc(struct page *page)
-{
-        VM_BUG_ON(!PageSlab(page));
-        return PageActive(page);
-}
-
-static inline void SetPageSlabPfmemalloc(struct page *page)
-{
-        VM_BUG_ON(!PageSlab(page));
-        SetPageActive(page);
-}
-
-static inline void __ClearPageSlabPfmemalloc(struct page *page)
-{
-        VM_BUG_ON(!PageSlab(page));
-        __ClearPageActive(page);
-}
-
-static inline void ClearPageSlabPfmemalloc(struct page *page)
-{
-        VM_BUG_ON(!PageSlab(page));
-        ClearPageActive(page);
-}
-
 #ifdef CONFIG_MMU
 #define __PG_MLOCKED            (1 << PG_mlocked)
 #else