path: root/mm/memory.c
diff options
authorDave Airlie <airlied@redhat.com>2019-07-15 15:16:20 +1000
committerDave Airlie <airlied@redhat.com>2019-07-15 15:16:20 +1000
commit6dfc43d3a19174faead54575c204aee106225f43 (patch)
treeea954860d6282c5017a644c775305a752c8fd2a9 /mm/memory.c
parentMerge tag 'imx-drm-next-2019-07-05' of git://git.pengutronix.de/git/pza/linux into drm-next (diff)
mm: adjust apply_to_pfn_range interface for dropped token.
mm/pgtable: drop pgtable_t variable from pte_fn_t functions drops the token came in via the hmm tree, this caused lots of conflicts, but applying this cleanup patch should reduce it to something easier to handle. Just accept the token is unused at this point. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to '')
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 462aa47f8878..b8218e962231 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++, token, addr, closure);
+ err = closure->ptefn(pte++, addr, closure);
if (err)
} 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, pgtable_t token,
+static int apply_to_page_range_wrapper(pte_t *pte,
unsigned long addr,
struct pfn_range_apply *pter)
struct page_range_apply *pra =
container_of(pter, typeof(*pra), pter);
- return pra->fn(pte, token, addr, pra->data);
+ return pra->fn(pte, NULL, addr, pra->data);