aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2019-07-16 04:06:29 +1000
committerDave Airlie <airlied@redhat.com>2019-07-16 04:06:29 +1000
commit7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014 (patch)
tree45792fb429a0a592568ebfe82ec1af86ebbfd497 /mm/memory.c
parentmm: adjust apply_to_pfn_range interface for dropped token. (diff)
downloadlinux-dev-7e4b4dfc98d54bc79f7ca29c8bc6307ed2948014.tar.xz
linux-dev-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 '')
-rw-r--r--mm/memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c
index b8218e962231..462aa47f8878 100644
--- 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);
}
/*