diff options
-rw-r--r-- | include/linux/init.h | 3 | ||||
-rw-r--r-- | init/main.c | 2 | ||||
-rw-r--r-- | kernel/irq/internals.h | 2 | ||||
-rw-r--r-- | kernel/irq/spurious.c | 2 | ||||
-rw-r--r-- | kernel/printk.c | 8 |
5 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 9146f39cdddf..6b951095a42f 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _LINUX_INIT_H | 2 | #define _LINUX_INIT_H |
3 | 3 | ||
4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
5 | #include <linux/types.h> | ||
5 | 6 | ||
6 | /* These macros are used to mark some functions or | 7 | /* These macros are used to mark some functions or |
7 | * initialized data (doesn't apply to uninitialized data) | 8 | * initialized data (doesn't apply to uninitialized data) |
@@ -156,7 +157,7 @@ void prepare_namespace(void); | |||
156 | 157 | ||
157 | extern void (*late_time_init)(void); | 158 | extern void (*late_time_init)(void); |
158 | 159 | ||
159 | extern int initcall_debug; | 160 | extern bool initcall_debug; |
160 | 161 | ||
161 | #endif | 162 | #endif |
162 | 163 | ||
diff --git a/init/main.c b/init/main.c index 415548e808d2..ff49a6dacfbb 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -648,7 +648,7 @@ static void __init do_ctors(void) | |||
648 | #endif | 648 | #endif |
649 | } | 649 | } |
650 | 650 | ||
651 | int initcall_debug; | 651 | bool initcall_debug; |
652 | core_param(initcall_debug, initcall_debug, bool, 0644); | 652 | core_param(initcall_debug, initcall_debug, bool, 0644); |
653 | 653 | ||
654 | static char msgbuf[64]; | 654 | static char msgbuf[64]; |
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index a73dd6c7372d..b7952316016a 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #define istate core_internal_state__do_not_mess_with_it | 16 | #define istate core_internal_state__do_not_mess_with_it |
17 | 17 | ||
18 | extern int noirqdebug; | 18 | extern bool noirqdebug; |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * Bits used by threaded handlers: | 21 | * Bits used by threaded handlers: |
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index dc813a948be2..611cd6003c45 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -325,7 +325,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
325 | desc->irqs_unhandled = 0; | 325 | desc->irqs_unhandled = 0; |
326 | } | 326 | } |
327 | 327 | ||
328 | int noirqdebug __read_mostly; | 328 | bool noirqdebug __read_mostly; |
329 | 329 | ||
330 | int noirqdebug_setup(char *str) | 330 | int noirqdebug_setup(char *str) |
331 | { | 331 | { |
diff --git a/kernel/printk.c b/kernel/printk.c index 63b3bc31fe32..13c0a1143f49 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -521,7 +521,7 @@ static void __call_console_drivers(unsigned start, unsigned end) | |||
521 | } | 521 | } |
522 | } | 522 | } |
523 | 523 | ||
524 | static int __read_mostly ignore_loglevel; | 524 | static bool __read_mostly ignore_loglevel; |
525 | 525 | ||
526 | static int __init ignore_loglevel_setup(char *str) | 526 | static int __init ignore_loglevel_setup(char *str) |
527 | { | 527 | { |
@@ -696,9 +696,9 @@ static void zap_locks(void) | |||
696 | } | 696 | } |
697 | 697 | ||
698 | #if defined(CONFIG_PRINTK_TIME) | 698 | #if defined(CONFIG_PRINTK_TIME) |
699 | static int printk_time = 1; | 699 | static bool printk_time = 1; |
700 | #else | 700 | #else |
701 | static int printk_time = 0; | 701 | static bool printk_time = 0; |
702 | #endif | 702 | #endif |
703 | module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); | 703 | module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); |
704 | 704 | ||
@@ -1098,7 +1098,7 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha | |||
1098 | return -1; | 1098 | return -1; |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | int console_suspend_enabled = 1; | 1101 | bool console_suspend_enabled = 1; |
1102 | EXPORT_SYMBOL(console_suspend_enabled); | 1102 | EXPORT_SYMBOL(console_suspend_enabled); |
1103 | 1103 | ||
1104 | static int __init console_suspend_disable(char *str) | 1104 | static int __init console_suspend_disable(char *str) |