[PATCH 02/12] make panic and hang __noreturn functions

Sascha Hauer s.hauer at pengutronix.de
Tue Mar 30 07:06:45 EDT 2010


Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/startup.c |    2 +-
 include/common.h |    4 ++--
 lib/vsprintf.c   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/startup.c b/common/startup.c
index 6dca270..c7d0cf0 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -161,7 +161,7 @@ void start_barebox (void)
 	/* NOTREACHED - no way out of command loop except booting */
 }
 
-void hang (void)
+void __noreturn hang (void)
 {
 	puts ("### ERROR ### Please RESET the board ###\n");
 	for (;;);
diff --git a/include/common.h b/include/common.h
index 3b3d2de..fb1400c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -65,8 +65,8 @@ typedef void (interrupt_handler_t)(void *);
  */
 void reginfo(void);
 
-void	hang (void) __attribute__ ((noreturn));
-void	panic(const char *fmt, ...);
+void __noreturn hang (void);
+void __noreturn panic(const char *fmt, ...);
 
 /* */
 long int initdram (int);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 26fcaa7..91ad613 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -593,7 +593,7 @@ char *asprintf(const char *fmt, ...)
 }
 EXPORT_SYMBOL(asprintf);
 
-void panic(const char *fmt, ...)
+void __noreturn panic(const char *fmt, ...)
 {
 	va_list	args;
 	va_start(args, fmt);
-- 
1.7.0




More information about the barebox mailing list