Changeset 5f83634 in mainline for kernel/generic

Timestamp:

2010-07-12T16:45:05Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b1a85c

Parents:

bee2d4c (diff), 8078180 (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 from lp:~jakub/helenos/upa

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• src/debug/panic.c (modified) (2 diffs)

kernel/generic/include/mm/as.h

@@ -171 +171 @@
         PF_ACCESS_READ,
         PF_ACCESS_WRITE,
-        PF_ACCESS_EXEC
+        PF_ACCESS_EXEC,
+        PF_ACCESS_UNKNOWN
 } pf_access_t;
 

kernel/generic/src/debug/panic.c

@@ -61 +61 @@
         } else if (cat == PANIC_BADTRAP) {
                 printf("BAD TRAP %ld.\n", address);
+                if (fmt) {
+                        vprintf(fmt, args);
+                        printf("\n");
+                }
         } else if (cat == PANIC_MEMTRAP) {
                 printf("A BAD MEMORY ACCESS WHILE ");
@@ -72 +76 @@
                         printf("REFERENCING");
                 printf(" ADDRESS %p.\n", address); 
+                if (fmt) {
+                        vprintf(fmt, args);
+                        printf("\n");
+                }
         } else {
                 printf("THE FOLLOWING REASON:\n");
                 vprintf(fmt, args);
+                printf("\n");
         }
         va_end(args);