Merge tag 'xtensa-20190510' of git://github.com/jcmvbkbc/linux-xtensa

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4592bf7997c000dc7a5537ca4c28b308713b9d65..82b84e5ee30d5387c8ff0d6a03caf1bb054e651c 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -562,7 +562,6 @@ config BUILD_BIN2C
 
 config IKCONFIG
        tristate "Kernel .config support"
-       select BUILD_BIN2C
        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation
@@ -580,6 +579,16 @@ config IKCONFIG_PROC
          This option enables access to the kernel configuration file
          through /proc/config.gz.
 
+config IKHEADERS_PROC
+       tristate "Enable kernel header artifacts through /proc/kheaders.tar.xz"
+       depends on PROC_FS
+       help
+         This option enables access to the kernel header and other artifacts that
+         are generated during the build process. These can be used to build eBPF
+         tracing programs, or similar programs.  If you build the headers as a
+         module, a module called kheaders.ko is built which can be loaded on-demand
+         to get access to the headers.
+
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
        range 12 25
@@ -1171,9 +1180,6 @@ config LD_DEAD_CODE_DATA_ELIMINATION
 config SYSCTL
        bool
 
-config ANON_INODES
-       bool
-
 config HAVE_UID16
        bool
 
@@ -1378,14 +1384,12 @@ config HAVE_FUTEX_CMPXCHG
 config EPOLL
        bool "Enable eventpoll support" if EXPERT
        default y
-       select ANON_INODES
        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the signalfd() system call that allows to receive signals
@@ -1395,7 +1399,6 @@ config SIGNALFD
 
 config TIMERFD
        bool "Enable timerfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the timerfd() system call that allows to receive timer
@@ -1405,7 +1408,6 @@ config TIMERFD
 
 config EVENTFD
        bool "Enable eventfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the eventfd() system call that allows to receive both
@@ -1516,7 +1518,6 @@ config KALLSYMS_BASE_RELATIVE
 # syscall, maps, verifier
 config BPF_SYSCALL
        bool "Enable bpf() system call"
-       select ANON_INODES
        select BPF
        select IRQ_WORK
        default n
@@ -1533,7 +1534,6 @@ config BPF_JIT_ALWAYS_ON
 
 config USERFAULTFD
        bool "Enable userfaultfd() system call"
-       select ANON_INODES
        depends on MMU
        help
          Enable the userfaultfd() system call that allows to intercept and
@@ -1600,7 +1600,6 @@ config PERF_EVENTS
        bool "Kernel performance events and counters"
        default y if PROFILING
        depends on HAVE_PERF_EVENTS
-       select ANON_INODES
        select IRQ_WORK
        select SRCU
        help