Skip to content

L
linux
Commit dafc2d0f authored by Petr Mladek's avatar Petr Mladek
Browse files
Options

Merge branch 'for-6.10-base-small' into for-linus

parents e0550222 27021649
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 43 deletions
arch/arm/configs/collie_defconfig
View file @ dafc2d0f
...@@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
CONFIG_ARCH_MULTI_V4=y CONFIG_ARCH_MULTI_V4=y
# CONFIG_ARCH_MULTI_V7 is not set # CONFIG_ARCH_MULTI_V7 is not set
......
arch/arm/configs/keystone_defconfig
View file @ dafc2d0f
...@@ -12,7 +12,7 @@ CONFIG_CGROUP_DEVICE=y ...@@ -12,7 +12,7 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ALL=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
CONFIG_PROFILING=y CONFIG_PROFILING=y
......
arch/arm/configs/lpc18xx_defconfig
View file @ dafc2d0f
...@@ -8,7 +8,7 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -8,7 +8,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_RD_LZ4 is not set # CONFIG_RD_LZ4 is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_UID16 is not set # CONFIG_UID16 is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/arm/configs/moxart_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y ...@@ -6,7 +6,7 @@ CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
# CONFIG_TIMERFD is not set # CONFIG_TIMERFD is not set
# CONFIG_EVENTFD is not set # CONFIG_EVENTFD is not set
......
arch/arm/configs/mps2_defconfig
View file @ dafc2d0f
...@@ -5,7 +5,7 @@ CONFIG_LOG_BUF_SHIFT=16 ...@@ -5,7 +5,7 @@ CONFIG_LOG_BUF_SHIFT=16
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_UID16 is not set # CONFIG_UID16 is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/arm/configs/omap1_defconfig
View file @ dafc2d0f
...@@ -9,7 +9,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -9,7 +9,7 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_SHMEM is not set # CONFIG_SHMEM is not set
# CONFIG_KALLSYMS is not set # CONFIG_KALLSYMS is not set
CONFIG_PROFILING=y CONFIG_PROFILING=y
......
arch/arm/configs/stm32_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -6,7 +6,7 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_UID16 is not set # CONFIG_UID16 is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/microblaze/configs/mmu_defconfig
View file @ dafc2d0f
...@@ -4,7 +4,7 @@ CONFIG_AUDIT=y ...@@ -4,7 +4,7 @@ CONFIG_AUDIT=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ALL=y
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
......
arch/mips/configs/rs90_defconfig
View file @ dafc2d0f
...@@ -9,7 +9,7 @@ CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y ...@@ -9,7 +9,7 @@ CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
# CONFIG_SGETMASK_SYSCALL is not set # CONFIG_SGETMASK_SYSCALL is not set
# CONFIG_SYSFS_SYSCALL is not set # CONFIG_SYSFS_SYSCALL is not set
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_TIMERFD is not set # CONFIG_TIMERFD is not set
# CONFIG_AIO is not set # CONFIG_AIO is not set
# CONFIG_IO_URING is not set # CONFIG_IO_URING is not set
......
arch/powerpc/configs/adder875_defconfig
View file @ dafc2d0f
...@@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y ...@@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
......
arch/powerpc/configs/ep88xc_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y ...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
......
arch/powerpc/configs/mpc866_ads_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y ...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_BUG is not set # CONFIG_BUG is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
......
arch/powerpc/configs/mpc885_ads_defconfig
View file @ dafc2d0f
...@@ -7,7 +7,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y ...@@ -7,7 +7,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
CONFIG_PERF_EVENTS=y CONFIG_PERF_EVENTS=y
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
......
arch/powerpc/configs/tqm8xx_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y ...@@ -6,7 +6,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_MODULES=y CONFIG_MODULES=y
......
arch/riscv/configs/nommu_k210_defconfig
View file @ dafc2d0f
...@@ -11,7 +11,7 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -11,7 +11,7 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSFS_SYSCALL is not set # CONFIG_SYSFS_SYSCALL is not set
# CONFIG_FHANDLE is not set # CONFIG_FHANDLE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/riscv/configs/nommu_k210_sdcard_defconfig
View file @ dafc2d0f
...@@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=13 ...@@ -3,7 +3,7 @@ CONFIG_LOG_BUF_SHIFT=13
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSFS_SYSCALL is not set # CONFIG_SYSFS_SYSCALL is not set
# CONFIG_FHANDLE is not set # CONFIG_FHANDLE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/riscv/configs/nommu_virt_defconfig
View file @ dafc2d0f
...@@ -10,7 +10,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y ...@@ -10,7 +10,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EXPERT=y CONFIG_EXPERT=y
# CONFIG_SYSFS_SYSCALL is not set # CONFIG_SYSFS_SYSCALL is not set
# CONFIG_FHANDLE is not set # CONFIG_FHANDLE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
# CONFIG_TIMERFD is not set # CONFIG_TIMERFD is not set
......
arch/sh/configs/edosk7705_defconfig
View file @ dafc2d0f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# CONFIG_PRINTK is not set # CONFIG_PRINTK is not set
# CONFIG_BUG is not set # CONFIG_BUG is not set
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set # CONFIG_SIGNALFD is not set
......
arch/sh/configs/se7619_defconfig
View file @ dafc2d0f
...@@ -4,7 +4,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -4,7 +4,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_KALLSYMS is not set # CONFIG_KALLSYMS is not set
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set
......
arch/sh/configs/se7712_defconfig
View file @ dafc2d0f
...@@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ALL=y
# CONFIG_BUG is not set # CONFIG_BUG is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_SHMEM is not set # CONFIG_SHMEM is not set
CONFIG_MODULES=y CONFIG_MODULES=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
......
arch/sh/configs/se7721_defconfig
View file @ dafc2d0f
...@@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ALL=y
# CONFIG_BUG is not set # CONFIG_BUG is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_SHMEM is not set # CONFIG_SHMEM is not set
CONFIG_MODULES=y CONFIG_MODULES=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
......
arch/sh/configs/shmin_defconfig
View file @ dafc2d0f
...@@ -5,7 +5,7 @@ CONFIG_LOG_BUF_SHIFT=14 ...@@ -5,7 +5,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_HOTPLUG is not set # CONFIG_HOTPLUG is not set
# CONFIG_BUG is not set # CONFIG_BUG is not set
# CONFIG_ELF_CORE is not set # CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set CONFIG_BASE_SMALL=y
# CONFIG_FUTEX is not set # CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set # CONFIG_EPOLL is not set
# CONFIG_SHMEM is not set # CONFIG_SHMEM is not set
......
arch/x86/include/asm/mpspec.h
View file @ dafc2d0f
...@@ -16,10 +16,10 @@ extern int pic_mode; ...@@ -16,10 +16,10 @@ extern int pic_mode;
* Summit or generic (i.e. installer) kernels need lots of bus entries. * Summit or generic (i.e. installer) kernels need lots of bus entries.
* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. * Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets.
*/ */
#if CONFIG_BASE_SMALL == 0 #ifdef CONFIG_BASE_SMALL
# define MAX_MP_BUSSES 260
#else
# define MAX_MP_BUSSES 32 # define MAX_MP_BUSSES 32
#else
# define MAX_MP_BUSSES 260
#endif #endif
#define MAX_IRQ_SOURCES 256 #define MAX_IRQ_SOURCES 256
......
drivers/tty/vt/vc_screen.c
View file @ dafc2d0f
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#define HEADER_SIZE 4u #define HEADER_SIZE 4u
#define CON_BUF_SIZE (CONFIG_BASE_SMALL ? 256 : PAGE_SIZE) #define CON_BUF_SIZE (IS_ENABLED(CONFIG_BASE_SMALL) ? 256 : PAGE_SIZE)
/* /*
* Our minor space: * Our minor space:
......
include/linux/threads.h
View file @ dafc2d0f
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
/* /*
* This controls the default maximum pid allocated to a process * This controls the default maximum pid allocated to a process
*/ */
#define PID_MAX_DEFAULT (CONFIG_BASE_SMALL ? 0x1000 : 0x8000) #define PID_MAX_DEFAULT (IS_ENABLED(CONFIG_BASE_SMALL) ? 0x1000 : 0x8000)
/* /*
* A maximum of 4 million PIDs should be enough for a while. * A maximum of 4 million PIDs should be enough for a while.
* [NOTE: PID/TIDs are limited to 2^30 ~= 1 billion, see FUTEX_TID_MASK.] * [NOTE: PID/TIDs are limited to 2^30 ~= 1 billion, see FUTEX_TID_MASK.]
*/ */
#define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \ #define PID_MAX_LIMIT (IS_ENABLED(CONFIG_BASE_SMALL) ? PAGE_SIZE * 8 : \
(sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT)) (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT))
/* /*
......
include/linux/udp.h
View file @ dafc2d0f
...@@ -24,7 +24,7 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb) ...@@ -24,7 +24,7 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
} }
#define UDP_HTABLE_SIZE_MIN_PERNET 128 #define UDP_HTABLE_SIZE_MIN_PERNET 128
#define UDP_HTABLE_SIZE_MIN (CONFIG_BASE_SMALL ? 128 : 256) #define UDP_HTABLE_SIZE_MIN (IS_ENABLED(CONFIG_BASE_SMALL) ? 128 : 256)
#define UDP_HTABLE_SIZE_MAX 65536 #define UDP_HTABLE_SIZE_MAX 65536
static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask) static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask)
......
include/linux/xarray.h
View file @ dafc2d0f
...@@ -1141,7 +1141,7 @@ static inline void xa_release(struct xarray *xa, unsigned long index) ...@@ -1141,7 +1141,7 @@ static inline void xa_release(struct xarray *xa, unsigned long index)
* doubled the number of slots per node, we'd get only 3 nodes per 4kB page. * doubled the number of slots per node, we'd get only 3 nodes per 4kB page.
*/ */
#ifndef XA_CHUNK_SHIFT #ifndef XA_CHUNK_SHIFT
#define XA_CHUNK_SHIFT (CONFIG_BASE_SMALL ? 4 : 6) #define XA_CHUNK_SHIFT (IS_ENABLED(CONFIG_BASE_SMALL) ? 4 : 6)
#endif #endif
#define XA_CHUNK_SIZE (1UL << XA_CHUNK_SHIFT) #define XA_CHUNK_SIZE (1UL << XA_CHUNK_SHIFT)
#define XA_CHUNK_MASK (XA_CHUNK_SIZE - 1) #define XA_CHUNK_MASK (XA_CHUNK_SIZE - 1)
......
init/Kconfig
View file @ dafc2d0f
...@@ -743,8 +743,8 @@ config LOG_CPU_MAX_BUF_SHIFT ...@@ -743,8 +743,8 @@ config LOG_CPU_MAX_BUF_SHIFT
int "CPU kernel log buffer size contribution (13 => 8 KB, 17 => 128KB)" int "CPU kernel log buffer size contribution (13 => 8 KB, 17 => 128KB)"
depends on SMP depends on SMP
range 0 21 range 0 21
default 12 if !BASE_SMALL
default 0 if BASE_SMALL default 0 if BASE_SMALL
default 12
depends on PRINTK depends on PRINTK
help help
This option allows to increase the default ring buffer size This option allows to increase the default ring buffer size
...@@ -1585,11 +1585,10 @@ config PCSPKR_PLATFORM ...@@ -1585,11 +1585,10 @@ config PCSPKR_PLATFORM
This option allows to disable the internal PC-Speaker This option allows to disable the internal PC-Speaker
support, saving some memory. support, saving some memory.
config BASE_FULL config BASE_SMALL
default y bool "Enable smaller-sized data structures for core" if EXPERT
bool "Enable full-sized data structures for core" if EXPERT
help help
Disabling this option reduces the size of miscellaneous core Enabling this option reduces the size of miscellaneous core
kernel data structures. This saves memory on small machines, kernel data structures. This saves memory on small machines,
but may reduce performance. but may reduce performance.
...@@ -1944,11 +1943,6 @@ config RT_MUTEXES ...@@ -1944,11 +1943,6 @@ config RT_MUTEXES
bool bool
default y if PREEMPT_RT default y if PREEMPT_RT
config BASE_SMALL
int
default 0 if BASE_FULL
default 1 if !BASE_FULL
config MODULE_SIG_FORMAT config MODULE_SIG_FORMAT
def_bool n def_bool n
select SYSTEM_DATA_VERIFICATION select SYSTEM_DATA_VERIFICATION
......
kernel/futex/core.c
View file @ dafc2d0f
...@@ -1150,7 +1150,7 @@ static int __init futex_init(void) ...@@ -1150,7 +1150,7 @@ static int __init futex_init(void)
unsigned int futex_shift; unsigned int futex_shift;
unsigned long i; unsigned long i;
#if CONFIG_BASE_SMALL #ifdef CONFIG_BASE_SMALL
futex_hashsize = 16; futex_hashsize = 16;
#else #else
futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus()); futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus());
......
kernel/user.c
View file @ dafc2d0f
...@@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(init_user_ns); ...@@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(init_user_ns);
* when changing user ID's (ie setuid() and friends). * when changing user ID's (ie setuid() and friends).
*/ */
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 7) #define UIDHASH_BITS (IS_ENABLED(CONFIG_BASE_SMALL) ? 3 : 7)
#define UIDHASH_SZ (1 << UIDHASH_BITS) #define UIDHASH_SZ (1 << UIDHASH_BITS)
#define UIDHASH_MASK (UIDHASH_SZ - 1) #define UIDHASH_MASK (UIDHASH_SZ - 1)
#define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) #define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK)
......
tools/testing/selftests/wireguard/qemu/kernel.config
View file @ dafc2d0f
...@@ -41,7 +41,6 @@ CONFIG_KALLSYMS=y ...@@ -41,7 +41,6 @@ CONFIG_KALLSYMS=y
CONFIG_BUG=y CONFIG_BUG=y
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
CONFIG_JUMP_LABEL=y CONFIG_JUMP_LABEL=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_SHMEM=y CONFIG_SHMEM=y
CONFIG_SLUB=y CONFIG_SLUB=y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7