* [PATCH 10/15] module_param: make bool parameters really bool (core code)
@ 2011-12-15 3:13 Rusty Russell
2011-12-16 19:58 ` Paul E. McKenney
0 siblings, 1 reply; 3+ messages in thread
From: Rusty Russell @ 2011-12-15 3:13 UTC (permalink / raw)
To: lkml - Kernel Mailing List; +Cc: Pawel Moll
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (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 <rusty@rustcorp.com.au>
---
include/linux/init.h | 3 ++-
init/main.c | 2 +-
kernel/irq/internals.h | 2 +-
kernel/irq/spurious.c | 2 +-
kernel/printk.c | 8 ++++----
kernel/rcutorture.c | 4 ++--
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/include/linux/init.h b/include/linux/init.h
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -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)
@@ -156,7 +157,7 @@ void prepare_namespace(void);
extern void (*late_time_init)(void);
-extern int initcall_debug;
+extern bool initcall_debug;
#endif
diff --git a/init/main.c b/init/main.c
--- a/init/main.c
+++ b/init/main.c
@@ -654,7 +654,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];
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -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:
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -325,7 +325,7 @@ void note_interrupt(unsigned int irq, st
desc->irqs_unhandled = 0;
}
-int noirqdebug __read_mostly;
+bool noirqdebug __read_mostly;
int noirqdebug_setup(char *str)
{
diff --git a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -521,7 +521,7 @@ static void __call_console_drivers(unsig
}
}
-static int __read_mostly ignore_loglevel;
+static bool __read_mostly ignore_loglevel;
static int __init ignore_loglevel_setup(char *str)
{
@@ -695,9 +695,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);
@@ -1099,7 +1099,7 @@ int update_console_cmdline(char *name, i
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)
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -56,8 +56,8 @@ static int nreaders = -1; /* # reader th
static int nfakewriters = 4; /* # fake writer threads */
static int stat_interval; /* Interval between stats, in seconds. */
/* Defaults to "only at end of test". */
-static int verbose; /* Print more debug info. */
-static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */
+static bool verbose; /* Print more debug info. */
+static bool test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */
static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/
static int stutter = 5; /* Start/stop testing interval (in sec) */
static int irqreader = 1; /* RCU readers from irq (timers). */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 10/15] module_param: make bool parameters really bool (core code)
2011-12-15 3:13 [PATCH 10/15] module_param: make bool parameters really bool (core code) Rusty Russell
@ 2011-12-16 19:58 ` Paul E. McKenney
2011-12-19 2:20 ` Rusty Russell
0 siblings, 1 reply; 3+ messages in thread
From: Paul E. McKenney @ 2011-12-16 19:58 UTC (permalink / raw)
To: Rusty Russell; +Cc: lkml - Kernel Mailing List, Pawel Moll
On Thu, Dec 15, 2011 at 01:43:24PM +1030, Rusty Russell wrote:
> module_param(bool) used to counter-intuitively take an int. In
> fddd5201 (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 <rusty@rustcorp.com.au>
For the rcutorture component:
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Given that this portion of the patch is self-sufficient, I have queued
the rcutorture portion of this patch with your signed-off-by, which I
can push for either 3.3 or 3.4 (default is most likely 3.4). Of course,
if you would prefer some other approach, please let me know.
Thanx, Paul
> ---
> include/linux/init.h | 3 ++-
> init/main.c | 2 +-
> kernel/irq/internals.h | 2 +-
> kernel/irq/spurious.c | 2 +-
> kernel/printk.c | 8 ++++----
> kernel/rcutorture.c | 4 ++--
> 6 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/include/linux/init.h b/include/linux/init.h
> --- a/include/linux/init.h
> +++ b/include/linux/init.h
> @@ -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)
> @@ -156,7 +157,7 @@ void prepare_namespace(void);
>
> extern void (*late_time_init)(void);
>
> -extern int initcall_debug;
> +extern bool initcall_debug;
>
> #endif
>
> diff --git a/init/main.c b/init/main.c
> --- a/init/main.c
> +++ b/init/main.c
> @@ -654,7 +654,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];
> diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
> --- a/kernel/irq/internals.h
> +++ b/kernel/irq/internals.h
> @@ -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:
> diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
> --- a/kernel/irq/spurious.c
> +++ b/kernel/irq/spurious.c
> @@ -325,7 +325,7 @@ void note_interrupt(unsigned int irq, st
> desc->irqs_unhandled = 0;
> }
>
> -int noirqdebug __read_mostly;
> +bool noirqdebug __read_mostly;
>
> int noirqdebug_setup(char *str)
> {
> diff --git a/kernel/printk.c b/kernel/printk.c
> --- a/kernel/printk.c
> +++ b/kernel/printk.c
> @@ -521,7 +521,7 @@ static void __call_console_drivers(unsig
> }
> }
>
> -static int __read_mostly ignore_loglevel;
> +static bool __read_mostly ignore_loglevel;
>
> static int __init ignore_loglevel_setup(char *str)
> {
> @@ -695,9 +695,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);
>
> @@ -1099,7 +1099,7 @@ int update_console_cmdline(char *name, i
> 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)
> diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
> --- a/kernel/rcutorture.c
> +++ b/kernel/rcutorture.c
> @@ -56,8 +56,8 @@ static int nreaders = -1; /* # reader th
> static int nfakewriters = 4; /* # fake writer threads */
> static int stat_interval; /* Interval between stats, in seconds. */
> /* Defaults to "only at end of test". */
> -static int verbose; /* Print more debug info. */
> -static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */
> +static bool verbose; /* Print more debug info. */
> +static bool test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */
> static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/
> static int stutter = 5; /* Start/stop testing interval (in sec) */
> static int irqreader = 1; /* RCU readers from irq (timers). */
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 10/15] module_param: make bool parameters really bool (core code)
2011-12-16 19:58 ` Paul E. McKenney
@ 2011-12-19 2:20 ` Rusty Russell
0 siblings, 0 replies; 3+ messages in thread
From: Rusty Russell @ 2011-12-19 2:20 UTC (permalink / raw)
To: paulmck; +Cc: lkml - Kernel Mailing List, Pawel Moll
On Fri, 16 Dec 2011 11:58:30 -0800, "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> On Thu, Dec 15, 2011 at 01:43:24PM +1030, Rusty Russell wrote:
> > module_param(bool) used to counter-intuitively take an int. In
> > fddd5201 (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 <rusty@rustcorp.com.au>
>
> For the rcutorture component:
>
> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Tested-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
>
> Given that this portion of the patch is self-sufficient, I have queued
> the rcutorture portion of this patch with your signed-off-by, which I
> can push for either 3.3 or 3.4 (default is most likely 3.4). Of course,
> if you would prefer some other approach, please let me know.
Nope, more than happy. Have removed it from my patch.
Cheers,
Rusty.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-19 6:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-15 3:13 [PATCH 10/15] module_param: make bool parameters really bool (core code) Rusty Russell
2011-12-16 19:58 ` Paul E. McKenney
2011-12-19 2:20 ` Rusty Russell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.