Merge tag 'usb-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8b1ab81ecda8f8cea83da326ffa9e9d150473fcf..9bd50ba8253f73ef4c5d064416129f6ce09ac1ca 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2,9 +2,9 @@ config DEFCONFIG_LIST
        string
        depends on !UML
        option defconfig_list
-       default "/lib/modules/$(shell,uname --release)/.config"
+       default "/lib/modules/$(shell,uname -r)/.config"
        default "/etc/kernel-config"
-       default "/boot/config-$(shell,uname --release)"
+       default "/boot/config-$(shell,uname -r)"
        default ARCH_DEFCONFIG
        default "arch/$(ARCH)/defconfig"
 
@@ -107,6 +107,15 @@ config LOCALVERSION_AUTO
 
          which is done within the script "scripts/setlocalversion".)
 
+config BUILD_SALT
+       string "Build ID Salt"
+       default ""
+       help
+          The build ID is used to link binaries and their debug info. Setting
+          this option will use the value in the calculation of the build id.
+          This is mostly useful for distributions which want to ensure the
+          build is unique between builds. It's safe to leave the default.
+
 config HAVE_KERNEL_GZIP
        bool
 
@@ -231,9 +240,16 @@ config DEFAULT_HOSTNAME
          but you may wish to use a different default here to make a minimal
          system more usable with less configuration.
 
+#
+# For some reason microblaze and nios2 hard code SWAP=n.  Hopefully we can
+# add proper SWAP support to them, in which case this can be remove.
+#
+config ARCH_NO_SWAP
+       bool
+
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
-       depends on MMU && BLOCK
+       depends on MMU && BLOCK && !ARCH_NO_SWAP
        default y
        help
          This option allows you to choose whether you want to have support
@@ -332,6 +348,7 @@ config AUDIT_TREE
 
 source "kernel/irq/Kconfig"
 source "kernel/time/Kconfig"
+source "kernel/Kconfig.preempt"
 
 menu "CPU/Task time and stats accounting"
 
@@ -691,6 +708,11 @@ config MEMCG_SWAP_ENABLED
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).
 
+config MEMCG_KMEM
+       bool
+       depends on MEMCG && !SLOB
+       default y
+
 config BLK_CGROUP
        bool "IO controller"
        depends on BLOCK
@@ -1727,10 +1749,10 @@ config PROFILING
 config TRACEPOINTS
        bool
 
-source "arch/Kconfig"
-
 endmenu                # General setup
 
+source "arch/Kconfig"
+
 config RT_MUTEXES
        bool