Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / page-flags.h

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 98ada58f9942855b90583de9c5ed324993d39101..d1fe1a761047683e555a9544dd5c668d5ae6752b 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -228,9 +228,9 @@ PAGEFLAG(OwnerPriv1, owner_priv_1) TESTCLEARFLAG(OwnerPriv1, owner_priv_1)
 TESTPAGEFLAG(Writeback, writeback) TESTSCFLAG(Writeback, writeback)
 PAGEFLAG(MappedToDisk, mappedtodisk)
 
-/* PG_readahead is only used for file reads; PG_reclaim is only for writes */
+/* PG_readahead is only used for reads; PG_reclaim is only for writes */
 PAGEFLAG(Reclaim, reclaim) TESTCLEARFLAG(Reclaim, reclaim)
-PAGEFLAG(Readahead, reclaim)           /* Reminder to do async read-ahead */
+PAGEFLAG(Readahead, reclaim) TESTCLEARFLAG(Readahead, reclaim)
 
 #ifdef CONFIG_HIGHMEM
 /*
@@ -412,7 +412,7 @@ static inline void ClearPageCompound(struct page *page)
  */
 static inline int PageTransHuge(struct page *page)
 {
-       VM_BUG_ON(PageTail(page));
+       VM_BUG_ON_PAGE(PageTail(page), page);
        return PageHead(page);
 }
 
@@ -460,25 +460,25 @@ static inline int PageTransTail(struct page *page)
  */
 static inline int PageSlabPfmemalloc(struct page *page)
 {
-       VM_BUG_ON(!PageSlab(page));
+       VM_BUG_ON_PAGE(!PageSlab(page), page);
        return PageActive(page);
 }
 
 static inline void SetPageSlabPfmemalloc(struct page *page)
 {
-       VM_BUG_ON(!PageSlab(page));
+       VM_BUG_ON_PAGE(!PageSlab(page), page);
        SetPageActive(page);
 }
 
 static inline void __ClearPageSlabPfmemalloc(struct page *page)
 {
-       VM_BUG_ON(!PageSlab(page));
+       VM_BUG_ON_PAGE(!PageSlab(page), page);
        __ClearPageActive(page);
 }
 
 static inline void ClearPageSlabPfmemalloc(struct page *page)
 {
-       VM_BUG_ON(!PageSlab(page));
+       VM_BUG_ON_PAGE(!PageSlab(page), page);
        ClearPageActive(page);
 }