Skip to content

Commit

Permalink
module_param: make bool parameters really bool (core code)
Browse files Browse the repository at this point in the history
module_param(bool) used to counter-intuitively take an int.  In
fddd520 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

It's time to remove the int/unsigned int option.  For this version
it'll simply give a warning, but it'll break next kernel version.

Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
rustyrussell committed Jan 12, 2012
1 parent 6d6a55e commit 2329abf
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion include/linux/init.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define _LINUX_INIT_H

#include <linux/compiler.h>
#include <linux/types.h>

/* These macros are used to mark some functions or
* initialized data (doesn't apply to uninitialized data)
Expand Down Expand Up @@ -156,7 +157,7 @@ void prepare_namespace(void);

extern void (*late_time_init)(void);

extern int initcall_debug;
extern bool initcall_debug;

#endif

Expand Down
2 changes: 1 addition & 1 deletion init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ static void __init do_ctors(void)
#endif
}

int initcall_debug;
bool initcall_debug;
core_param(initcall_debug, initcall_debug, bool, 0644);

static char msgbuf[64];
Expand Down
2 changes: 1 addition & 1 deletion kernel/irq/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#define istate core_internal_state__do_not_mess_with_it

extern int noirqdebug;
extern bool noirqdebug;

/*
* Bits used by threaded handlers:
Expand Down
2 changes: 1 addition & 1 deletion kernel/irq/spurious.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
desc->irqs_unhandled = 0;
}

int noirqdebug __read_mostly;
bool noirqdebug __read_mostly;

int noirqdebug_setup(char *str)
{
Expand Down
8 changes: 4 additions & 4 deletions kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ static void __call_console_drivers(unsigned start, unsigned end)
}
}

static int __read_mostly ignore_loglevel;
static bool __read_mostly ignore_loglevel;

static int __init ignore_loglevel_setup(char *str)
{
Expand Down Expand Up @@ -696,9 +696,9 @@ static void zap_locks(void)
}

#if defined(CONFIG_PRINTK_TIME)
static int printk_time = 1;
static bool printk_time = 1;
#else
static int printk_time = 0;
static bool printk_time = 0;
#endif
module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);

Expand Down Expand Up @@ -1098,7 +1098,7 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
return -1;
}

int console_suspend_enabled = 1;
bool console_suspend_enabled = 1;
EXPORT_SYMBOL(console_suspend_enabled);

static int __init console_suspend_disable(char *str)
Expand Down

0 comments on commit 2329abf

Please sign in to comment.