OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of https://github.com/openrisc/linux
[tomoyo/tomoyo-test1.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
78c9bd5
..
b7fa020
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-220,7
+220,7
@@
static bool remove_migration_pte(struct folio *folio,
if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
pte = pte_mkdirty(pte);
if (is_writable_migration_entry(entry))
- pte = pte_mkwrite(pte);
+ pte = pte_mkwrite(pte
, vma
);
else if (pte_swp_uffd_wp(old_pte))
pte = pte_mkuffd_wp(pte);