Revert "mm: adjust apply_to_pfn_range interface for dropped token."

This reverts commit 6dfc43d3a19174faead54575c204aee106225f43.

Going to revert the whole vmwwgfx pull.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index c45f936bd81cf007d872bc317a9c0c1da5c86cd9..798cdda9560e46d5c553bde90076683f4d91b14e 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2687,7 +2687,7 @@ extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
                               unsigned long size, pte_fn_t fn, void *data);
 
 struct pfn_range_apply;
-typedef int (*pter_fn_t)(pte_t *pte, unsigned long addr,
+typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
                         struct pfn_range_apply *closure);
 struct pfn_range_apply {
        struct mm_struct *mm;

diff --git a/mm/as_dirty_helpers.c b/mm/as_dirty_helpers.c
index 6352a37294081362f423cea590a99456788ecd19..f600e31534fb35ec3ca354fcd4b349bbb631a214 100644 (file)
--- a/mm/as_dirty_helpers.c
+++ b/mm/as_dirty_helpers.c
@@ -26,6 +26,7 @@ struct apply_as {
 /**
  * apply_pt_wrprotect - Leaf pte callback to write-protect a pte
  * @pte: Pointer to the pte
+ * @token: Page table token, see apply_to_pfn_range()
  * @addr: The virtual page address
  * @closure: Pointer to a struct pfn_range_apply embedded in a
  * struct apply_as
@@ -35,7 +36,7 @@ struct apply_as {
  *
  * Return: Always zero.
  */
-static int apply_pt_wrprotect(pte_t *pte,
+static int apply_pt_wrprotect(pte_t *pte, pgtable_t token,
                              unsigned long addr,
                              struct pfn_range_apply *closure)
 {
@@ -77,6 +78,7 @@ struct apply_as_clean {
 /**
  * apply_pt_clean - Leaf pte callback to clean a pte
  * @pte: Pointer to the pte
+ * @token: Page table token, see apply_to_pfn_range()
  * @addr: The virtual page address
  * @closure: Pointer to a struct pfn_range_apply embedded in a
  * struct apply_as_clean
@@ -89,7 +91,7 @@ struct apply_as_clean {
  *
  * Return: Always zero.
  */
-static int apply_pt_clean(pte_t *pte,
+static int apply_pt_clean(pte_t *pte, pgtable_t token,
                          unsigned long addr,
                          struct pfn_range_apply *closure)
 {

diff --git a/mm/memory.c b/mm/memory.c
index b8218e9622316f6b4fda02b36b4cfe078da3f50e..462aa47f88783b368b1d511ea8420201c0417bf7 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2053,7 +2053,7 @@ static int apply_to_pte_range(struct pfn_range_apply *closure, pmd_t *pmd,
        token = pmd_pgtable(*pmd);
 
        do {
-               err = closure->ptefn(pte++, addr, closure);
+               err = closure->ptefn(pte++, token, addr, closure);
                if (err)
                        break;
        } while (addr += PAGE_SIZE, addr != end);
@@ -2194,14 +2194,14 @@ struct page_range_apply {
  * Callback wrapper to enable use of apply_to_pfn_range for
  * the apply_to_page_range interface
  */
-static int apply_to_page_range_wrapper(pte_t *pte,
+static int apply_to_page_range_wrapper(pte_t *pte, pgtable_t token,
                                       unsigned long addr,
                                       struct pfn_range_apply *pter)
 {
        struct page_range_apply *pra =
                container_of(pter, typeof(*pra), pter);
 
-       return pra->fn(pte, NULL, addr, pra->data);
+       return pra->fn(pte, token, addr, pra->data);
 }
 
 /*