Fixed warning noreturn function returns in arch_system.c

diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index c4e4b1b026e819c0be48c1e8c4f0f16452fea5f7..8b33e06293c831a4c877195a2249ec09b9f25527 100644 (file)
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -30,7 +30,7 @@
 
 PRIVATE int osfxsr_feature; /* FXSAVE/FXRSTOR instructions support (SSEx) */
 
-extern void poweroff_jmp();
+extern __dead void poweroff_jmp();
 extern void poweroff16();
 extern void poweroff16_end();
 
@@ -48,7 +48,7 @@ PUBLIC __dead void arch_monitor(void)
        monitor();
 }
 
-PUBLIC void arch_bios_poweroff(void)
+PRIVATE __dead void arch_bios_poweroff(void)
 {
        u32_t cr0;
        
@@ -148,6 +148,8 @@ PUBLIC __dead void arch_shutdown(const int how)
                        SOFT_RESET_FLAG_SIZE);
                reset();
        }
+
+       NOT_REACHABLE;
 }
 
 /* address of a.out headers, set in mpx386.s */

diff --git a/kernel/proto.h b/kernel/proto.h
index 4ea0f5a3a8174d2d51ad0c9797fbe51059022f2d..4f71d7c94c8a1d4188b342d078ed4141c4f6a429 100644 (file)
--- a/kernel/proto.h
+++ b/kernel/proto.h
@@ -171,7 +171,6 @@ _PROTOTYPE( void arch_init, (void)                                     );
 _PROTOTYPE( void ser_putc, (char)                                              );
 _PROTOTYPE( __dead void arch_shutdown, (int)                           );
 _PROTOTYPE( __dead void arch_monitor, (void)                           );
-_PROTOTYPE( void arch_bios_poweroff, (void)                                    );
 _PROTOTYPE( void arch_get_aout_headers, (int i, struct exec *h)                );
 _PROTOTYPE( void restore_user_context, (struct proc * p)                );
 _PROTOTYPE( void read_tsc, (unsigned long *high, unsigned long *low)    );