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/memory.c | |
| parent | 26215b7ee923b9251f7bb12c4e5f09dc465d35f2 (diff) | |
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/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index f88c351aecd4..81cc75e71888 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1393,12 +1393,10 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, unsigned long addr, pte_t *pte, struct zap_details *details, pte_t pteval) { -#ifdef CONFIG_PTE_MARKER_UFFD_WP if (zap_drop_file_uffd_wp(details)) return; pte_install_uffd_wp_if_needed(vma, addr, pte, pteval); -#endif } static unsigned long zap_pte_range(struct mmu_gather *tlb, |