Skip to content

Commit b64d8d1

Browse files
xzpetertorvalds
authored andcommitted
mm/userfaultfd: disable userfaultfd-wp on x86_32
Userfaultfd-wp is not yet working on 32bit hosts, but it's accidentally enabled previously. Disable it. Fixes: 5a28106 ("userfaultfd: wp: add WP pagetable tracking to x86") Reported-by: Naresh Kamboju <[email protected]> Reported-by: kernel test robot <[email protected]> Signed-off-by: Peter Xu <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Tested-by: Naresh Kamboju <[email protected]> Reviewed-by: Andrea Arcangeli <[email protected]> Cc: Hillf Danton <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 89b83f2 commit b64d8d1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ config X86
149149
select HAVE_ARCH_TRACEHOOK
150150
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
151151
select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64
152-
select HAVE_ARCH_USERFAULTFD_WP if USERFAULTFD
152+
select HAVE_ARCH_USERFAULTFD_WP if X86_64 && USERFAULTFD
153153
select HAVE_ARCH_VMAP_STACK if X86_64
154154
select HAVE_ARCH_WITHIN_STACK_FRAMES
155155
select HAVE_ASM_MODVERSIONS

0 commit comments

Comments
 (0)