diff options
author | Dave Airlie | 2019-07-15 20:06:29 +0200 |
---|---|---|
committer | Dave Airlie | 2019-07-15 20:06:29 +0200 |
commit | 7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014 (patch) | |
tree | 45792fb429a0a592568ebfe82ec1af86ebbfd497 /mm/as_dirty_helpers.c | |
parent | mm: adjust apply_to_pfn_range interface for dropped token. (diff) | |
download | kernel-qcow2-linux-7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014.tar.gz kernel-qcow2-linux-7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014.tar.xz kernel-qcow2-linux-7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014.zip |
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>
Diffstat (limited to 'mm/as_dirty_helpers.c')
-rw-r--r-- | mm/as_dirty_helpers.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/as_dirty_helpers.c b/mm/as_dirty_helpers.c index 6352a3729408..f600e31534fb 100644 --- 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) { |