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: Kees Cook <keescook@chromium.org>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Michael 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kees Cook 2016-03-17 14:23:00 -07:00 committed by Linus Torvalds
parent a81a5a17d4
commit 4cc7ecb7f2
8 changed files with 15 additions and 53 deletions

View File

@ -49,7 +49,7 @@ static unsigned int rtas_error_log_buffer_max;
static unsigned int event_scan; static unsigned int event_scan;
static unsigned int rtas_event_scan_rate; 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 */ /* Stop logging to nvram after first fatal error */
static int logging_enabled; /* Until we initialize everything, static int logging_enabled; /* Until we initialize everything,
@ -592,11 +592,6 @@ __setup("surveillance=", surveillance_setup);
static int __init rtasmsgs_setup(char *str) static int __init rtasmsgs_setup(char *str)
{ {
if (strcmp(str, "on") == 0) return (kstrtobool(str, &full_rtas_msgs) == 0);
full_rtas_msgs = 1;
else if (strcmp(str, "off") == 0)
full_rtas_msgs = 0;
return 1;
} }
__setup("rtasmsgs=", rtasmsgs_setup); __setup("rtasmsgs=", rtasmsgs_setup);

View File

@ -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 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. * Enable/disable cede_offline when available.
*/ */
static int __init setup_cede_offline(char *str) static int __init setup_cede_offline(char *str)
{ {
if (!strcmp(str, "off")) return (kstrtobool(str, &cede_offline_enabled) == 0);
cede_offline_enabled = 0;
else if (!strcmp(str, "on"))
cede_offline_enabled = 1;
else
return 0;
return 1;
} }
__setup("cede_offline=", setup_cede_offline); __setup("cede_offline=", setup_cede_offline);

View File

@ -1432,7 +1432,7 @@ device_initcall(etr_init_sysfs);
/* /*
* Server Time Protocol (STP) code. * Server Time Protocol (STP) code.
*/ */
static int stp_online; static bool stp_online;
static struct stp_sstpi stp_info; static struct stp_sstpi stp_info;
static void *stp_page; static void *stp_page;
@ -1443,11 +1443,7 @@ static struct timer_list stp_timer;
static int __init early_parse_stp(char *p) static int __init early_parse_stp(char *p)
{ {
if (strncmp(p, "off", 3) == 0) return kstrtobool(p, &stp_online);
stp_online = 0;
else if (strncmp(p, "on", 2) == 0)
stp_online = 1;
return 0;
} }
early_param("stp", early_parse_stp); early_param("stp", early_parse_stp);

View File

@ -37,7 +37,7 @@ static void set_topology_timer(void);
static void topology_work_fn(struct work_struct *work); static void topology_work_fn(struct work_struct *work);
static struct sysinfo_15_1_x *tl_info; 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); 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) static int __init early_parse_topology(char *p)
{ {
if (strncmp(p, "off", 3)) return kstrtobool(p, &topology_enabled);
return 0;
topology_enabled = 0;
return 0;
} }
early_param("topology", early_parse_topology); early_param("topology", early_parse_topology);

View File

@ -227,19 +227,11 @@ static u32 __init search_agp_bridge(u32 *order, int *valid_agp)
return 0; return 0;
} }
static int gart_fix_e820 __initdata = 1; static bool gart_fix_e820 __initdata = true;
static int __init parse_gart_mem(char *p) static int __init parse_gart_mem(char *p)
{ {
if (!p) return kstrtobool(p, &gart_fix_e820);
return -EINVAL;
if (!strncmp(p, "off", 3))
gart_fix_e820 = 0;
else if (!strncmp(p, "on", 2))
gart_fix_e820 = 1;
return 0;
} }
early_param("gart_fix_e820", parse_gart_mem); early_param("gart_fix_e820", parse_gart_mem);

View File

@ -111,7 +111,7 @@ enum tick_dep_bits {
#define TICK_DEP_MASK_CLOCK_UNSTABLE (1 << TICK_DEP_BIT_CLOCK_UNSTABLE) #define TICK_DEP_MASK_CLOCK_UNSTABLE (1 << TICK_DEP_BIT_CLOCK_UNSTABLE)
#ifdef CONFIG_NO_HZ_COMMON #ifdef CONFIG_NO_HZ_COMMON
extern int tick_nohz_enabled; extern bool tick_nohz_enabled;
extern int tick_nohz_tick_stopped(void); extern int tick_nohz_tick_stopped(void);
extern void tick_nohz_idle_enter(void); extern void tick_nohz_idle_enter(void);
extern void tick_nohz_idle_exit(void); extern void tick_nohz_idle_exit(void);

View File

@ -515,7 +515,7 @@ static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
/* /*
* High resolution timer enabled ? * High resolution timer enabled ?
*/ */
static int hrtimer_hres_enabled __read_mostly = 1; static bool hrtimer_hres_enabled __read_mostly = true;
unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC; unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC;
EXPORT_SYMBOL_GPL(hrtimer_resolution); EXPORT_SYMBOL_GPL(hrtimer_resolution);
@ -524,13 +524,7 @@ EXPORT_SYMBOL_GPL(hrtimer_resolution);
*/ */
static int __init setup_hrtimer_hres(char *str) static int __init setup_hrtimer_hres(char *str)
{ {
if (!strcmp(str, "off")) return (kstrtobool(str, &hrtimer_hres_enabled) == 0);
hrtimer_hres_enabled = 0;
else if (!strcmp(str, "on"))
hrtimer_hres_enabled = 1;
else
return 0;
return 1;
} }
__setup("highres=", setup_hrtimer_hres); __setup("highres=", setup_hrtimer_hres);

View File

@ -486,20 +486,14 @@ void __init tick_nohz_init(void)
/* /*
* NO HZ enabled ? * NO HZ enabled ?
*/ */
int tick_nohz_enabled __read_mostly = 1; bool tick_nohz_enabled __read_mostly = true;
unsigned long tick_nohz_active __read_mostly; unsigned long tick_nohz_active __read_mostly;
/* /*
* Enable / Disable tickless mode * Enable / Disable tickless mode
*/ */
static int __init setup_tick_nohz(char *str) static int __init setup_tick_nohz(char *str)
{ {
if (!strcmp(str, "off")) return (kstrtobool(str, &tick_nohz_enabled) == 0);
tick_nohz_enabled = 0;
else if (!strcmp(str, "on"))
tick_nohz_enabled = 1;
else
return 0;
return 1;
} }
__setup("nohz=", setup_tick_nohz); __setup("nohz=", setup_tick_nohz);