Commit 4cc7ecb7 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

param: convert some "on"/"off" users to strtobool 



This changes several users of manual "on"/"off" parsing to use
strtobool.

Some side-effects:
- these uses will now parse y/n/1/0 meaningfully too
- the early_param uses will now bubble up parse errors

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Cc: Amitkumar Karwar <akarwar@marvell.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Joe Perches <joe@perches.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Nishant Sarmukadam <nishants@marvell.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Steve French <sfrench@samba.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a81a5a17

arch/powerpc/kernel/rtasd.c

+2 −7
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static unsigned int rtas_error_log_buffer_max; 
static unsigned int event_scan;

static unsigned int rtas_event_scan_rate;



static int full_rtas_msgs = 0;

static bool full_rtas_msgs;



/* Stop logging to nvram after first fatal error */

static int logging_enabled; /* Until we initialize everything,
@@ -592,11 +592,6 @@ __setup("surveillance=", surveillance_setup); 


static int __init rtasmsgs_setup(char *str)

{

	if (strcmp(str, "on") == 0)

		full_rtas_msgs = 1;

	else if (strcmp(str, "off") == 0)

		full_rtas_msgs = 0;



	return 1;

	return (kstrtobool(str, &full_rtas_msgs) == 0);

}

__setup("rtasmsgs=", rtasmsgs_setup);

arch/powerpc/platforms/pseries/hotplug-cpu.c

+2 −8
Original line number Diff line number Diff line
@@ -47,20 +47,14 @@ static DEFINE_PER_CPU(enum cpu_state_vals, current_state) = CPU_STATE_OFFLINE; 


static enum cpu_state_vals default_offline_state = CPU_STATE_OFFLINE;



static int cede_offline_enabled __read_mostly = 1;

static bool cede_offline_enabled __read_mostly = true;



/*

 * Enable/disable cede_offline when available.

 */

static int __init setup_cede_offline(char *str)

{

	if (!strcmp(str, "off"))

		cede_offline_enabled = 0;

	else if (!strcmp(str, "on"))

		cede_offline_enabled = 1;

	else

		return 0;

	return 1;

	return (kstrtobool(str, &cede_offline_enabled) == 0);

}



__setup("cede_offline=", setup_cede_offline);

arch/s390/kernel/time.c

+2 −6
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ device_initcall(etr_init_sysfs); 
/*

 * Server Time Protocol (STP) code.

 */

static int stp_online;

static bool stp_online;

static struct stp_sstpi stp_info;

static void *stp_page;
@@ -1443,11 +1443,7 @@ static struct timer_list stp_timer; 


static int __init early_parse_stp(char *p)

{

	if (strncmp(p, "off", 3) == 0)

		stp_online = 0;

	else if (strncmp(p, "on", 2) == 0)

		stp_online = 1;

	return 0;

	return kstrtobool(p, &stp_online);

}

early_param("stp", early_parse_stp);

arch/s390/kernel/topology.c

+2 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void set_topology_timer(void); 
static void topology_work_fn(struct work_struct *work);

static struct sysinfo_15_1_x *tl_info;



static int topology_enabled = 1;

static bool topology_enabled = true;

static DECLARE_WORK(topology_work, topology_work_fn);



/*
@@ -444,10 +444,7 @@ static const struct cpumask *cpu_book_mask(int cpu) 


static int __init early_parse_topology(char *p)

{

	if (strncmp(p, "off", 3))

		return 0;

	topology_enabled = 0;

	return 0;

	return kstrtobool(p, &topology_enabled);

}

early_param("topology", early_parse_topology);

arch/x86/kernel/aperture_64.c

+2 −10
Original line number Diff line number Diff line
@@ -227,19 +227,11 @@ static u32 __init search_agp_bridge(u32 *order, int *valid_agp) 
	return 0;

}



static int gart_fix_e820 __initdata = 1;

static bool gart_fix_e820 __initdata = true;



static int __init parse_gart_mem(char *p)

{

	if (!p)

		return -EINVAL;



	if (!strncmp(p, "off", 3))

		gart_fix_e820 = 0;

	else if (!strncmp(p, "on", 2))

		gart_fix_e820 = 1;



	return 0;

	return kstrtobool(p, &gart_fix_e820);

}

early_param("gart_fix_e820", parse_gart_mem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE