aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-06-19 17:52:18 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-09-30 16:46:02 +0200
commitb5065fe42bae3379cc169a7ebab48805d4dd8eb2 (patch)
tree89fdff07fca56a37283be5cc8a45429dbf5ca9ff
parentx86: remove errant CFI usage from rwlock (diff)
downloadrhel7-kernel-misery-b5065fe42bae3379cc169a7ebab48805d4dd8eb2.tar.xz
rhel7-kernel-misery-b5065fe42bae3379cc169a7ebab48805d4dd8eb2.zip
mm: guard pudp_clear_flush_notify with mm notifier config
Without CONFIG_MMU_NOTIFIER, pudp_clear_flush_notify isn't defined and doesn't make sense, so ifdef that out of the huge page path. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--mm/huge_memory.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 4d7993ce39b..a709ea6eb32 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2035,7 +2035,9 @@ void __split_huge_page_pud(struct vm_area_struct *vma, unsigned long address,
if (unlikely(!pud_trans_huge(*pud) && !pud_devmap(*pud)))
goto out;
BUG_ON(vma->vm_start > haddr || vma->vm_end < haddr + HPAGE_PUD_SIZE);
+#ifdef CONFIG_MMU_NOTIFIER
pudp_clear_flush_notify(vma, haddr, pud);
+#endif
out:
spin_unlock(ptl);