Changes in kernel/generic/include/panic.h [9ac2013:f651e80] in mainline

File:

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

kernel/generic/include/panic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jakub Jermar
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */
@@ -36 +36 @@
 #define KERN_PANIC_H_
 
-#include <typedefs.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__);
+#else
+#       define panic(format, ...) \
+                panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__);
+#endif
 
-#define panic(fmt, ...) \
-        panic_common(PANIC_OTHER, NULL, 0, 0, fmt, ##__VA_ARGS__)
-
-#define panic_assert(fmt, ...) \
-        panic_common(PANIC_ASSERT, NULL, 0, 0, fmt, ##__VA_ARGS__)
-
-#define panic_badtrap(istate, n, fmt, ...) \
-        panic_common(PANIC_BADTRAP, istate, 0, n, fmt, ##__VA_ARGS__)
-
-#define panic_memtrap(istate, access, addr, fmt, ...) \
-        panic_common(PANIC_MEMTRAP, istate, access, addr, fmt, ##__VA_ARGS__)
-
-typedef enum {
-        PANIC_OTHER,
-        PANIC_ASSERT,
-        PANIC_BADTRAP,
-        PANIC_MEMTRAP
-} panic_category_t;
-
-struct istate;
-
-extern bool silent;
-
-extern void panic_common(panic_category_t, struct istate *, int,
-    uintptr_t, const char *, ...) __attribute__ ((noreturn))
-    PRINTF_ATTRIBUTE(5, 6);
+extern void panic_printf(char *fmt, ...) __attribute__((noreturn));
 
 #endif