Merge tag 'docs-4.10' of git://git.lwn.net/linux

[mirror_ubuntu-artful-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 172f80ea0d588173b9d7ce674760e466c5faf52f..aafafeb0c1178a224629bbfd09c8bcaa3fdda166 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1154,6 +1154,18 @@ config CGROUP_PERF
 
          Say N if unsure.
 
+config CGROUP_BPF
+       bool "Support for eBPF programs attached to cgroups"
+       depends on BPF_SYSCALL && SOCK_CGROUP_DATA
+       help
+         Allow attaching eBPF programs to a cgroup using the bpf(2)
+         syscall command BPF_PROG_ATTACH.
+
+         In which context these programs are accessed depends on the type
+         of attachment. For instance, programs that are attached using
+         BPF_CGROUP_INET_INGRESS will be executed on the ingress path of
+         inet sockets.
+
 config CGROUP_DEBUG
        bool "Example controller"
        default n
@@ -1445,6 +1457,23 @@ config SYSCTL_SYSCALL
 
          If unsure say N here.
 
+config POSIX_TIMERS
+       bool "Posix Clocks & timers" if EXPERT
+       default y
+       help
+         This includes native support for POSIX timers to the kernel.
+         Some embedded systems have no use for them and therefore they
+         can be configured out to reduce the size of the kernel image.
+
+         When this option is disabled, the following syscalls won't be
+         available: timer_create, timer_gettime: timer_getoverrun,
+         timer_settime, timer_delete, clock_adjtime, getitimer,
+         setitimer, alarm. Furthermore, the clock_settime, clock_gettime,
+         clock_getres and clock_nanosleep syscalls will be limited to
+         CLOCK_REALTIME, CLOCK_MONOTONIC and CLOCK_BOOTTIME only.
+
+         If unsure say y.
+
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
         default y