From: Tomas Hruby <tom@minix3.org>
Date: Fri, 6 Aug 2010 12:48:26 +0000 (+0000)
Subject: Fixed warning noreturn function returns in arch_system.c
X-Git-Tag: v3.1.8~86
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doc/syslog.conf.5.html?a=commitdiff_plain;h=f7ef192c02ab3ec504875173f4a2c953b87847ab;p=minix.git

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 c4e4b1b02..8b33e0629 100644
--- 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 4ea0f5a3a..4f71d7c94 100644
--- 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)    );