kernel: bump 5.4 to 5.4.152

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

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index d99ce44c0dd6cfa28ea9fc39155e22d3b4f24dd8..d4648a50644448bad6ddcee650fd9ea394923ab4 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1,8 +1,6 @@
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# Copyright (C) 2006-2014 OpenWrt.org
 
 config KERNEL_BUILD_USER
        string "Custom Kernel Build User Name"
@@ -365,10 +363,6 @@ config KERNEL_KPROBES
          instrumentation and testing.
          If in doubt, say "N".
 
-config KERNEL_KPROBE_EVENT
-       bool
-       default y if KERNEL_KPROBES
-
 config KERNEL_KPROBE_EVENTS
        bool
        default y if KERNEL_KPROBES
@@ -442,34 +436,22 @@ config KERNEL_PROVE_LOCKING
        select KERNEL_DEBUG_KERNEL
        default n
 
-config KERNEL_LOCKUP_DETECTOR
-       bool "Compile the kernel with detect Hard and Soft Lockups"
+config KERNEL_SOFTLOCKUP_DETECTOR
+       bool "Compile the kernel with detect Soft Lockups"
        depends on KERNEL_DEBUG_KERNEL
        help
          Say Y here to enable the kernel to act as a watchdog to detect
-         hard and soft lockups.
+         soft lockups.
 
          Softlockups are bugs that cause the kernel to loop in kernel
          mode for more than 20 seconds, without giving other tasks a
          chance to run.  The current stack trace is displayed upon
          detection and the system will stay locked up.
 
-         Hardlockups are bugs that cause the CPU to loop in kernel mode
-         for more than 10 seconds, without letting other interrupts have a
-         chance to run.  The current stack trace is displayed upon detection
-         and the system will stay locked up.
-
-         The overhead should be minimal.  A periodic hrtimer runs to
-         generate interrupts and kick the watchdog task every 4 seconds.
-         An NMI is generated every 10 seconds or so to check for hardlockups.
-
-         The frequency of hrtimer and NMI events and the soft and hard lockup
-         thresholds can be controlled through the sysctl watchdog_thresh.
-
 config KERNEL_DETECT_HUNG_TASK
        bool "Compile the kernel with detect Hung Tasks"
        depends on KERNEL_DEBUG_KERNEL
-       default KERNEL_LOCKUP_DETECTOR
+       default KERNEL_SOFTLOCKUP_DETECTOR
        help
          Say Y here to enable the kernel to detect "hung tasks",
          which are bugs that cause the task to be stuck in
@@ -975,9 +957,10 @@ if KERNEL_IPV6
                def_bool n
 
        config KERNEL_IPV6_SEG6_LWTUNNEL
-               def_bool y if !SMALL_FLASH
+               bool "Enable support for lightweight tunnels"
+               default y if !SMALL_FLASH
                help
-                 Using lwtunnel requires full-ip package.
+                 Using lwtunnel (needed for IPv6 segment routing) requires ip-full package.
 
        config KERNEL_LWTUNNEL_BPF
                def_bool n
@@ -1179,6 +1162,16 @@ config KERNEL_SECURITY_SELINUX_DEVELOP
        depends on KERNEL_SECURITY_SELINUX
        default y
 
+config KERNEL_SECURITY_SELINUX_SIDTAB_HASH_BITS
+       int
+       depends on KERNEL_SECURITY_SELINUX
+       default 9
+
+config KERNEL_SECURITY_SELINUX_SID2STR_CACHE_SIZE
+       int
+       depends on KERNEL_SECURITY_SELINUX
+       default 256
+
 config KERNEL_LSM
        string
        default "lockdown,yama,loadpin,safesetid,integrity,selinux"