Changeset 0b9ac3c in mainline for kernel/generic/include/panic.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/panic.h (modified) (4 diffs)

kernel/generic/include/panic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_PANIC_H_
 
+#include <typedefs.h>
 #include <stacktrace.h>
 #include <print.h>
@@ -42 +43 @@
 #       define panic(format, ...) \
                 do { \
+                        silent = false; \
                         printf("Kernel panic in %s() at %s:%u.\n", \
                             __func__, __FILE__, __LINE__); \
@@ -50 +52 @@
 #else
 #       define panic(format, ...) \
-                panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__);
+                do { \
+                        silent = false; \
+                        panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__); \
+                } while (0)
 #endif
+
+extern bool silent;
 
 extern void panic_printf(char *fmt, ...) __attribute__((noreturn));