From a52834bb0c33adbaec5e2607f60e2eff2d7fa7e9 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 22 Sep 2016 07:55:30 -0600 Subject: [PATCH] UBUNTU: [Config] CONFIG_USERFAULTFD=y BugLink: http://bugs.launchpad.net/bugs/1626149 Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 1 + debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.flavour.generic | 1 - debian.master/config/powerpc/config.flavour.powerpc-e500mc | 1 - debian.master/config/powerpc/config.flavour.powerpc-smp | 1 - debian.master/config/powerpc/config.flavour.powerpc64-emb | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 12 files changed, 2 insertions(+), 10 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 331f97fdbd63..9a3014c9d084 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -1526,7 +1526,6 @@ CONFIG_USB_USS720=m CONFIG_USB_ZD1201=m # CONFIG_USB_ZERO is not set CONFIG_USELIB=y -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set CONFIG_VFIO=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 8ea199b7193d..64ce38ec3b43 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7715,6 +7715,7 @@ CONFIG_COMPAT_BRK mark note note CONFIG_JUMP_LABEL flag CONFIG_NUMA_BALANCING_DEFAULT_ENABLE note +CONFIG_USERFAULTFD mark note # Menu: General setup >> CPU/Task time and stats accounting CONFIG_BSD_PROCESS_ACCT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d195f2f0d10f..501e865c3971 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -1553,7 +1553,6 @@ CONFIG_USB_XHCI_PLATFORM=m # CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 9a9eecf24038..a6d961dbb1fa 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -1630,7 +1630,6 @@ CONFIG_USB_XHCI_PLATFORM=m # CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZERO is not set # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 558784fd3c7b..e7a26a7b6e55 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7497,6 +7497,7 @@ CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m CONFIG_USB_YUREX=m CONFIG_USB_ZR364XX=m +CONFIG_USERFAULTFD=y CONFIG_USER_NS=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_USER_STACKTRACE_SUPPORT=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 398717297f57..7fa442456a0e 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -1591,7 +1591,6 @@ CONFIG_USB_USS720=m CONFIG_USB_ZD1201=m # CONFIG_USB_ZERO is not set CONFIG_USELIB=y -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic index c36855773513..c42156f66d3c 100644 --- a/debian.master/config/powerpc/config.flavour.generic +++ b/debian.master/config/powerpc/config.flavour.generic @@ -1030,7 +1030,6 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_USS720 is not set # CONFIG_USB_XHCI_PLATFORM is not set # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc index ab06f493e0db..68f4d20caf31 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc +++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc @@ -1038,7 +1038,6 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_USS720=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_USELIB=y -CONFIG_USERFAULTFD=y CONFIG_USERIO=m CONFIG_VCNL4000=m CONFIG_VF610_ADC=m diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp index 50ddd64126b3..e2e526638bd1 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc-smp +++ b/debian.master/config/powerpc/config.flavour.powerpc-smp @@ -1038,7 +1038,6 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_USS720 is not set # CONFIG_USB_XHCI_PLATFORM is not set # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb index 631fac1f78b8..1b3bae49ea45 100644 --- a/debian.master/config/powerpc/config.flavour.powerpc64-emb +++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb @@ -1049,7 +1049,6 @@ CONFIG_USB_ULPI_BUS=m CONFIG_USB_USS720=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_USELIB=y -CONFIG_USERFAULTFD=y CONFIG_USERIO=m CONFIG_VCNL4000=m CONFIG_VF610_ADC=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index c94167e51ebd..6613de3b0ae9 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -1427,7 +1427,6 @@ CONFIG_USB_UHCI_HCD=m # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_ZD1201=m # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VF610_ADC is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 8e7df94e4e01..4972e488204f 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -985,7 +985,6 @@ CONFIG_UPROBES=y # CONFIG_USB_USS720 is not set # CONFIG_USB_XHCI_PLATFORM is not set # CONFIG_USELIB is not set -# CONFIG_USERFAULTFD is not set # CONFIG_USERIO is not set # CONFIG_VCNL4000 is not set # CONFIG_VFIO is not set -- 2.39.2