config/Config-images.in: enable zlib as the default ubi compression

[openwrt/openwrt.git] / config / Config-kernel.in

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index e64c4b775237e69a274c6c60fcf1b1a496fa5a49..06788d6a0f46e9cdd261ad863397e2cd3e4ef937 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -10,7 +10,7 @@ config KERNEL_PRINTK
 
 config KERNEL_CRASHLOG
        bool "Crash logging"
-       depends on !(arm || powerpc || sparc)
+       depends on !(arm || powerpc || sparc || TARGET_uml)
        default y
 
 config KERNEL_SWAP
@@ -299,12 +299,9 @@ if KERNEL_CGROUPS
                  the kmem extension can use it to guarantee that no group of processes
                  will ever exhaust kernel resources alone.
 
-       config KERNEL_PERF_EVENTS
-               bool
-               default y if KERNEL_CGROUP_PERF
-
        config KERNEL_CGROUP_PERF
                bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+               select KERNEL_PERF_EVENTS
                default n
                help
                  This option extends the per-cpu mode to restrict monitoring to