Changeset cf2af94 in mainline for kernel/generic/include/debug.h

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• kernel/generic/include/debug.h (modified) (2 diffs)

kernel/generic/include/debug.h

@@ -55 +55 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s", #expr); \
+                        panic_assert("%s() at %s:%u:\n%s", \
+                            __func__, __FILE__, __LINE__, #expr); \
         } while (0)
 
@@ -72 +73 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s, %s", #expr, msg); \
+                        panic_assert("%s() at %s:%u:\n%s, %s", \
+                            __func__, __FILE__, __LINE__, #expr, msg); \
         } while (0)