printk: Change type of CONFIG_BASE_SMALL to bool

CONFIG_BASE_SMALL is currently a type int but is only used as a boolean.

So, change its type to bool and adapt all usages:
CONFIG_BASE_SMALL == 0 becomes !IS_ENABLED(CONFIG_BASE_SMALL) and
CONFIG_BASE_SMALL != 0 becomes  IS_ENABLED(CONFIG_BASE_SMALL).

Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Link: https://lore.kernel.org/r/20240505080343.1471198-3-yoann.congal@smile.fr
Signed-off-by: Petr Mladek <pmladek@suse.com>

diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index c72c7ff78fcdc141e965910a89565a06a2a13027..d593e52e66359e9974ad62d57fbcba14a47a25f8 100644 (file)
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -16,10 +16,10 @@ extern int pic_mode;
  * 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.
  */
-#if CONFIG_BASE_SMALL == 0
-# define MAX_MP_BUSSES         260
-#else
+#ifdef CONFIG_BASE_SMALL
 # define MAX_MP_BUSSES         32
+#else
+# define MAX_MP_BUSSES         260
 #endif
 
 #define MAX_IRQ_SOURCES                256

diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 67e2cb7c96eec47e85eacc97e64109235901d373..da33c6c4691c0682d9cf87d96adbf5218f5bbf53 100644 (file)
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -51,7 +51,7 @@
 #include <asm/unaligned.h>
 
 #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:

diff --git a/include/linux/threads.h b/include/linux/threads.h
index c34173e6c5f18a754d4550ec29fb5ac08502df81..1674a471b0b4c266d069c79c435ef2ca50a9407f 100644 (file)
--- a/include/linux/threads.h
+++ b/include/linux/threads.h
@@ -25,13 +25,13 @@
 /*
  * 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.
  * [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))
 
 /*

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 3748e82b627b7044508db66adbf77c54a8e3d612..2d21cdb41ad859632fa28c5dca6cfd60038423ab 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -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            (CONFIG_BASE_SMALL ? 128 : 256)
+#define UDP_HTABLE_SIZE_MIN            (IS_ENABLED(CONFIG_BASE_SMALL) ? 128 : 256)
 #define UDP_HTABLE_SIZE_MAX            65536
 
 static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask)

diff --git a/include/linux/xarray.h b/include/linux/xarray.h
index cb571dfcf4b167ca1fbbe2edeeb4a96919955b9c..3f81ee5f9fb9cdc66a312d8c142434820b15c4aa 100644 (file)
--- a/include/linux/xarray.h
+++ b/include/linux/xarray.h
@@ -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.
  */
 #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
 #define XA_CHUNK_SIZE          (1UL << XA_CHUNK_SHIFT)
 #define XA_CHUNK_MASK          (XA_CHUNK_SIZE - 1)

diff --git a/init/Kconfig b/init/Kconfig
index ff5b607c3218daf4ede79a3d4ec2726c7bc50a93..4b517523d566d40eb34e46c09a070130d79f96ee 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -743,7 +743,7 @@ config LOG_CPU_MAX_BUF_SHIFT
        int "CPU kernel log buffer size contribution (13 => 8 KB, 17 => 128KB)"
        depends on SMP
        range 0 21
-       default 0 if BASE_SMALL != 0
+       default 0 if BASE_SMALL
        default 12
        depends on PRINTK
        help
@@ -1945,9 +1945,7 @@ config RT_MUTEXES
        default y if PREEMPT_RT
 
 config BASE_SMALL
-       int
-       default 0 if BASE_FULL
-       default 1 if !BASE_FULL
+       def_bool !BASE_FULL
 
 config MODULE_SIG_FORMAT
        def_bool n

diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index 1e78ef24321e82dbfaf0c07941a0c41ad3438aaa..06a1f091be81d84759245630c0d25500563c66ea 100644 (file)
--- 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 03cedc366dc9e1a3733b1e05a0f58356dbaee725..aa1162deafe49f6dfd7ce9ea33d27fcc0db67add 100644 (file)
--- 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)