diff options
| author | Peter Xu <peterx@redhat.com> | 2022-10-24 15:33:36 -0400 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-11-08 17:37:21 -0800 |
| commit | b12fdbf15f92b6cf5fecdd8a1855afe8809e5c58 (patch) | |
| tree | 65cccea20e27eb0909024e5a5eb0e516f4fbdc94 /mm/mprotect.c | |
| parent | 26215b7ee923b9251f7bb12c4e5f09dc465d35f2 (diff) | |
| download | lwn-b12fdbf15f92b6cf5fecdd8a1855afe8809e5c58.tar.gz lwn-b12fdbf15f92b6cf5fecdd8a1855afe8809e5c58.zip | |
Revert "mm/uffd: fix warning without PTE_MARKER_UFFD_WP compiled in"
With " mm/uffd: Fix vma check on userfault for wp" to fix the
registration, we'll be safe to remove the macro hacks now.
Link: https://lkml.kernel.org/r/20221024193336.1233616-3-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index 99762403cc8f..8d770855b591 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -267,7 +267,6 @@ static unsigned long change_pte_range(struct mmu_gather *tlb, } else { /* It must be an none page, or what else?.. */ WARN_ON_ONCE(!pte_none(oldpte)); -#ifdef CONFIG_PTE_MARKER_UFFD_WP if (unlikely(uffd_wp && !vma_is_anonymous(vma))) { /* * For file-backed mem, we need to be able to @@ -279,7 +278,6 @@ static unsigned long change_pte_range(struct mmu_gather *tlb, make_pte_marker(PTE_MARKER_UFFD_WP)); pages++; } -#endif } } while (pte++, addr += PAGE_SIZE, addr != end); arch_leave_lazy_mmu_mode(); |