* i386/i386at/kd.c (rebootflag): Use boolean instead of an int.
Remove duplicate variable declaration.
* i386/i386at/model_dep.c (rebootflag): Use boolean instead of an int.
---
i386/i386at/kd.c | 3 +--
i386/i386at/model_dep.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index cdc032c..fc1604b 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -107,7 +107,7 @@ void kd_enqsc(); /* enqueues a scancode
*/
#endif
struct tty kd_tty;
-extern int rebootflag;
+extern boolean_t rebootflag;
static void charput(), charmvup(), charmvdown(), charclear(), charsetcursor();
static void kd_noopreset();
@@ -989,7 +989,6 @@ Scancode scancode;
{
static int magic_state = KS_NORMAL; /* like kd_state */
boolean_t up = FALSE;
- extern int rebootflag;
if (scancode == 0x46) /* scroll lock */
/* if (scancode == 0x52) ** insert key */
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 1a3aee8..940f4de 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -131,7 +131,7 @@ void halt_cpu (void) __attribute__
((noreturn));
void inittodr(); /* forward */
-int rebootflag = 0; /* exported to kdintr */
+boolean_t rebootflag = FALSE; /* exported to kdintr */
/* XX interrupt stack pointer and highwater mark, for locore.S. */
vm_offset_t int_stack_top, int_stack_high;
@@ -234,7 +234,7 @@ void halt_all_cpus(reboot)
kdreboot();
}
else {
- rebootflag = 1;
+ rebootflag = TRUE;
#ifdef MACH_HYP
hyp_halt();
#endif /* MACH_HYP */
--
1.8.1.4