Changeset 371bd7d in mainline for kernel/generic/include/panic.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (2 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>
+
 #ifdef CONFIG_DEBUG
 #       define panic(format, ...) \
-                panic_printf("Kernel panic in %s() at %s:%u: " format "\n", \
-                __func__, __FILE__, __LINE__, ##__VA_ARGS__);
+                do { \
+                        silent = false; \
+                        printf("Kernel panic in %s() at %s:%u.\n", \
+                            __func__, __FILE__, __LINE__); \
+                        stack_trace(); \
+                        panic_printf("Panic message: " format "\n", \
+                            ##__VA_ARGS__);\
+                } while (0)
 #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 void panic_printf(char *fmt, ...) __attribute__((noreturn));
+extern bool silent;
+
+extern void panic_printf(const char *fmt, ...) __attribute__((noreturn));
 
 #endif