diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2015-09-04 18:46:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 19:54:41 -0400 |
commit | a14c151e567cb2c3e62611da808a8bdab86fdee5 (patch) | |
tree | b4161a242eff239842da903da1877672eed387bf | |
parent | 8d2afd96c20316d112e04d935d9e09150e988397 (diff) |
userfaultfd: buildsystem activation
This allows to select the userfaultfd during configuration to build it.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Cc: Sanidhya Kashyap <sanidhya.gatech@gmail.com>
Cc: zhang.zhanghailiang@huawei.com
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Andres Lagar-Cavilla <andreslc@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Hugh Dickins <hughd@google.com>
Cc: Peter Feiner <pfeiner@google.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: "Huangpeng (Peter)" <peter.huangpeng@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/Makefile | 1 | ||||
-rw-r--r-- | init/Kconfig | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 09e051fefc5b..f79cf4043e60 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
@@ -27,6 +27,7 @@ obj-$(CONFIG_ANON_INODES) += anon_inodes.o | |||
27 | obj-$(CONFIG_SIGNALFD) += signalfd.o | 27 | obj-$(CONFIG_SIGNALFD) += signalfd.o |
28 | obj-$(CONFIG_TIMERFD) += timerfd.o | 28 | obj-$(CONFIG_TIMERFD) += timerfd.o |
29 | obj-$(CONFIG_EVENTFD) += eventfd.o | 29 | obj-$(CONFIG_EVENTFD) += eventfd.o |
30 | obj-$(CONFIG_USERFAULTFD) += userfaultfd.o | ||
30 | obj-$(CONFIG_AIO) += aio.o | 31 | obj-$(CONFIG_AIO) += aio.o |
31 | obj-$(CONFIG_FS_DAX) += dax.o | 32 | obj-$(CONFIG_FS_DAX) += dax.o |
32 | obj-$(CONFIG_FILE_LOCKING) += locks.o | 33 | obj-$(CONFIG_FILE_LOCKING) += locks.o |
diff --git a/init/Kconfig b/init/Kconfig index bb9b4dd55889..161acd8bc56f 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1576,6 +1576,17 @@ config ADVISE_SYSCALLS | |||
1576 | applications use these syscalls, you can disable this option to save | 1576 | applications use these syscalls, you can disable this option to save |
1577 | space. | 1577 | space. |
1578 | 1578 | ||
1579 | config USERFAULTFD | ||
1580 | bool "Enable userfaultfd() system call" | ||
1581 | select ANON_INODES | ||
1582 | default y | ||
1583 | depends on MMU | ||
1584 | help | ||
1585 | Enable the userfaultfd() system call that allows to intercept and | ||
1586 | handle page faults in userland. | ||
1587 | |||
1588 | If unsure, say Y. | ||
1589 | |||
1579 | config PCI_QUIRKS | 1590 | config PCI_QUIRKS |
1580 | default y | 1591 | default y |
1581 | bool "Enable PCI quirk workarounds" if EXPERT | 1592 | bool "Enable PCI quirk workarounds" if EXPERT |