also voidify intr_init()

diff --git a/platform/hw/include/hw/kernel.h b/platform/hw/include/hw/kernel.h
index 18f148c6c097f71066f617ddaf45498c8574aa6f..25a22dc6658d15ee0eca27cc6c918de10915329a 100644 (file)
--- a/platform/hw/include/hw/kernel.h
+++ b/platform/hw/include/hw/kernel.h
@@ -20,7 +20,7 @@ bmk_time_t cpu_clock_now(void);
 bmk_time_t cpu_clock_epochoffset(void);
 
 void isr(int);
-int intr_init(void);
+void intr_init(void);
 void bmk_isr_rumpkernel(int (*)(void *), void *, int, int);
 
 #define BMK_MULTIBOOT_CMDLINE_SIZE 4096

diff --git a/platform/hw/intr.c b/platform/hw/intr.c
index 1b1323cf32ce2f7086e9375f1fa3f7577ff22109..4f7fa0c60c88ff1b0188b83f0e72adbaa4c43fc6 100644 (file)
--- a/platform/hw/intr.c
+++ b/platform/hw/intr.c
@@ -167,7 +167,7 @@ isr(int which)
        bmk_sched_wake(isr_thread);
 }
 
-int
+void
 intr_init(void)
 {
        int i;
@@ -178,6 +178,5 @@ intr_init(void)
 
        isr_thread = bmk_sched_create("isrthr", NULL, 0, doisr, NULL, NULL, 0);
        if (!isr_thread)
-               return BMK_EGENERIC;
-       return 0;
+               bmk_platform_halt("intr_init");
 }