Commit b3e90f37 authored by Yoann Congal's avatar Yoann Congal Committed by Petr Mladek
Browse files

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: default avatarPetr Mladek <pmladek@suse.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarYoann Congal <yoann.congal@smile.fr>
Link: https://lore.kernel.org/r/20240505080343.1471198-3-yoann.congal@smile.fr


Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 320bf431

arch/x86/include/asm/mpspec.h

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/tty/vt/vc_screen.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

include/linux/threads.h

+2 −2
Original line number Diff line number Diff line
@@ -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))



/*

include/linux/udp.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/xarray.h

+1 −1
Original line number Diff line number Diff line
@@ -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)