Skip to content

Commit 6f9ff39

Browse files
hboyd2003robimarko
authored andcommitted
config: drop kernel config symbols removed before v6.6
Since we don't support any kernel versions below v6.6, Kconfig options that were removed upstream before 6.6 are no longer relevant and should be dropped. This commit removes the following obsolete kernel config options: - KERNEL_UBSAN_NULL: Removed in v4.18 (3ca17b1f3628) - KERNEL_DEBUG_LL_UART_NONE: Removed in v4.0 (6f5194553c84) - KERNEL_SLABINFO: Removed in v4.15 (5b36577109be) - KERNEL_RESOURCE_COUNTERS: Removed in v3.18 (5b1efc027c0b) - KERNEL_MM_OWNER: Removed in v3.16 (f98bafa06a28) - KERNEL_MEMCG_SWAP: Removed in v6.1 (e55b9f96860f) - KERNEL_MEMCG_SWAP_ENABLED: Removed in v5.7 (2d1c498072de) - KERNEL_DEVPTS_MULTIPLE_INSTANCES: Removed in v4.7 (eedf265aa003) - KERNEL_DEVKMEM: Removed in v5.13 (bbcd53c96071) - KERNEL_SECURITY_SELINUX_DISABLE: Removed in v6.4 (f22f9aaf6c3d) Signed-off-by: Harrison Boyd <harrisonboyd400@gmail.com> Link: openwrt#19287 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 3a41c63 commit 6f9ff39

File tree

1 file changed

+0
-85
lines changed

1 file changed

+0
-85
lines changed

config/Config-kernel.in

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,6 @@ config KERNEL_UBSAN_BOUNDS
137137
{str,mem}*cpy() family of functions (that is addressed by
138138
FORTIFY_SOURCE).
139139

140-
config KERNEL_UBSAN_NULL
141-
bool "Enable checking of null pointers"
142-
depends on KERNEL_UBSAN
143-
help
144-
This option enables detection of memory accesses via a
145-
null pointer.
146-
147140
config KERNEL_UBSAN_TRAP
148141
bool "On Sanitizer warnings, abort the running kernel code"
149142
depends on KERNEL_UBSAN
@@ -498,16 +491,10 @@ config KERNEL_FRAME_WARN
498491
# KConfig wont evaluate them unless KERNEL_EARLY_PRINTK is selected
499492
# which means that buildroot wont override the DEBUG_LL symbols in target
500493
# kernel configurations and lead to devices that dont have working console
501-
config KERNEL_DEBUG_LL_UART_NONE
502-
bool
503-
default n
504-
depends on arm
505-
506494
config KERNEL_DEBUG_LL
507495
bool
508496
default n
509497
depends on arm
510-
select KERNEL_DEBUG_LL_UART_NONE
511498
help
512499
ARM low level debugging.
513500

@@ -743,11 +730,6 @@ config KERNEL_SLUB_DEBUG_ON
743730
This enables by default sanity_checks, red_zone, poison and store_user
744731
debugging options for all caches.
745732

746-
config KERNEL_SLABINFO
747-
select KERNEL_SLUB_DEBUG
748-
select KERNEL_SLUB_DEBUG_ON
749-
bool "Enable /proc slab debug info"
750-
751733
config KERNEL_STACKDEPOT_MAX_FRAMES
752734
int
753735
default 64
@@ -900,22 +882,10 @@ if KERNEL_CGROUPS
900882
Provides a simple Resource Controller for monitoring the
901883
total CPU consumed by the tasks in a cgroup.
902884

903-
config KERNEL_RESOURCE_COUNTERS
904-
bool "Resource counters"
905-
default y
906-
help
907-
This option enables controller independent resource accounting
908-
infrastructure that works with cgroups.
909-
910-
config KERNEL_MM_OWNER
911-
bool
912-
default y if KERNEL_MEMCG
913-
914885
config KERNEL_MEMCG
915886
bool "Memory Resource Controller for Control Groups"
916887
default y
917888
select KERNEL_FREEZER
918-
depends on KERNEL_RESOURCE_COUNTERS
919889
help
920890
Provides a memory resource controller that manages both anonymous
921891
memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -935,40 +905,6 @@ if KERNEL_CGROUPS
935905
This config option also selects MM_OWNER config option, which
936906
could in turn add some fork/exit overhead.
937907

938-
config KERNEL_MEMCG_SWAP
939-
bool "Memory Resource Controller Swap Extension"
940-
default y
941-
depends on KERNEL_MEMCG
942-
help
943-
Add swap management feature to memory resource controller. When you
944-
enable this, you can limit mem+swap usage per cgroup. In other words,
945-
when you disable this, memory resource controller has no cares to
946-
usage of swap...a process can exhaust all of the swap. This extension
947-
is useful when you want to avoid exhaustion swap but this itself
948-
adds more overheads and consumes memory for remembering information.
949-
Especially if you use 32bit system or small memory system, please
950-
be careful about enabling this. When memory resource controller
951-
is disabled by boot option, this will be automatically disabled and
952-
there will be no overhead from this. Even when you set this config=y,
953-
if boot option "swapaccount=0" is set, swap will not be accounted.
954-
Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
955-
size is 4096bytes, 512k per 1Gbytes of swap.
956-
957-
config KERNEL_MEMCG_SWAP_ENABLED
958-
bool "Memory Resource Controller Swap Extension enabled by default"
959-
depends on KERNEL_MEMCG_SWAP
960-
help
961-
Memory Resource Controller Swap Extension comes with its price in
962-
a bigger memory consumption. General purpose distribution kernels
963-
which want to enable the feature but keep it disabled by default
964-
and let the user enable it by swapaccount boot command line
965-
parameter should have this option unselected.
966-
967-
Those who want to have the feature enabled by default should
968-
select this option (if, for some reason, they need to disable it,
969-
then swapaccount=0 does the trick).
970-
971-
972908
config KERNEL_MEMCG_KMEM
973909
bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
974910
default y
@@ -1140,16 +1076,6 @@ if KERNEL_NAMESPACES
11401076

11411077
endif
11421078

1143-
config KERNEL_DEVPTS_MULTIPLE_INSTANCES
1144-
bool "Support multiple instances of devpts"
1145-
default y if !SMALL_FLASH
1146-
help
1147-
Enable support for multiple instances of devpts filesystem.
1148-
If you want to have isolated PTY namespaces (eg: in containers),
1149-
say Y here. Otherwise, say N. If enabled, each mount of devpts
1150-
filesystem with the '-o newinstance' option will create an
1151-
independent PTY namespace.
1152-
11531079
config KERNEL_POSIX_MQUEUE
11541080
bool "POSIX Message Queues"
11551081
default y if !SMALL_FLASH
@@ -1444,13 +1370,6 @@ config KERNEL_DEVMEM
14441370
The /dev/mem device is used to access areas of physical
14451371
memory.
14461372

1447-
config KERNEL_DEVKMEM
1448-
bool "/dev/kmem virtual device support"
1449-
help
1450-
Say Y here if you want to support the /dev/kmem device. The
1451-
/dev/kmem device is rarely used, but can be used for certain
1452-
kind of kernel debugging operations.
1453-
14541373
config KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE
14551374
int "Number of squashfs fragments cached"
14561375
default 2 if (SMALL_FLASH && !LOW_MEMORY_FOOTPRINT)
@@ -1501,10 +1420,6 @@ config KERNEL_SECURITY_SELINUX_BOOTPARAM
15011420
depends on KERNEL_SECURITY_SELINUX
15021421
default y
15031422

1504-
config KERNEL_SECURITY_SELINUX_DISABLE
1505-
bool "NSA SELinux runtime disable"
1506-
depends on KERNEL_SECURITY_SELINUX
1507-
15081423
config KERNEL_SECURITY_SELINUX_DEVELOP
15091424
bool "NSA SELinux Development Support"
15101425
depends on KERNEL_SECURITY_SELINUX

0 commit comments

Comments
 (0)