aboutsummaryrefslogtreecommitdiff
path: root/include/linux/page-flags.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/page-flags.h')
-rw-r--r--include/linux/page-flags.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 7a871e8e2a0..327a0190358 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -109,16 +109,9 @@ enum pageflags {
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
PG_compound_lock,
#endif
-#ifdef CONFIG_KSM_CHECK_PAGE
- PG_ksm_scan0, /* page has been scanned by even KSM cycle */
-#endif
PG_readahead, /* page in a readahead window */
__NR_PAGEFLAGS,
-#ifdef CONFIG_KSM_CHECK_PAGE
- /* page has been scanned by odd KSM cycle */
- PG_ksm_scan1 = PG_owner_priv_1,
-#endif
/* Filesystems */
PG_checked = PG_owner_priv_1,
@@ -218,10 +211,6 @@ PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
__PAGEFLAG(SlobFree, slob_free)
-#ifdef CONFIG_KSM_CHECK_PAGE
-CLEARPAGEFLAG(KsmScan0, ksm_scan0) TESTSETFLAG(KsmScan0, ksm_scan0)
-CLEARPAGEFLAG(KsmScan1, ksm_scan1) TESTSETFLAG(KsmScan1, ksm_scan1)
-#endif
/*
* Private page markings that may be used by the filesystem that owns the page
@@ -329,13 +318,23 @@ CLEARPAGEFLAG(Uptodate, uptodate)
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
int test_clear_page_writeback(struct page *page);
-int test_set_page_writeback(struct page *page);
+int __test_set_page_writeback(struct page *page, bool keep_write);
+
+#define test_set_page_writeback(page) \
+ __test_set_page_writeback(page, false)
+#define test_set_page_writeback_keepwrite(page) \
+ __test_set_page_writeback(page, true)
static inline void set_page_writeback(struct page *page)
{
test_set_page_writeback(page);
}
+static inline void set_page_writeback_keepwrite(struct page *page)
+{
+ test_set_page_writeback_keepwrite(page);
+}
+
#ifdef CONFIG_PAGEFLAGS_EXTENDED
/*
* System with lots of page flags available. This allows separate