diff options
| author | Petr Mladek <pmladek@suse.com> | 2024-05-15 11:58:26 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2024-05-15 11:58:26 +0200 |
| commit | dafc2d0f1bb9bb865a8420f77de56bafd8881cc5 (patch) | |
| tree | d342568bc9498c5f4949ece6ce3e2c91dde08335 /kernel | |
| parent | e0550222e03bae3fd629641e246ef7f47803d795 (diff) | |
| parent | 27021649ec88cf9aa14d2ac7e7f2e6789f055978 (diff) | |
Merge branch 'for-6.10-base-small' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex/core.c | 2 | ||||
| -rw-r--r-- | kernel/user.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex/core.c b/kernel/futex/core.c index 1e78ef24321e..06a1f091be81 100644 --- a/kernel/futex/core.c +++ b/kernel/futex/core.c @@ -1150,7 +1150,7 @@ static int __init futex_init(void) unsigned int futex_shift; unsigned long i; -#if CONFIG_BASE_SMALL +#ifdef CONFIG_BASE_SMALL futex_hashsize = 16; #else futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus()); diff --git a/kernel/user.c b/kernel/user.c index 03cedc366dc9..aa1162deafe4 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(init_user_ns); * 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_MASK (UIDHASH_SZ - 1) #define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) |