Changeset c47e1a8 in mainline for kernel/generic/include/stacktrace.h

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/include/stacktrace.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genericdebug 
+/** @addtogroup genericdebug
  * @{
  */
@@ -36 +36 @@
 #define KERN_STACKTRACE_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 
@@ -46 +45 @@
         bool (* frame_pointer_prev)(uintptr_t, uintptr_t *);
         bool (* return_address_get)(uintptr_t, uintptr_t *);
-        bool (* symbol_resolve)(uintptr_t, char **, uintptr_t *);
+        bool (* symbol_resolve)(uintptr_t, const char **, uintptr_t *);
 } stack_trace_ops_t;
 
@@ -60 +59 @@
  */
 extern uintptr_t frame_pointer_get(void);
-extern uintptr_t program_counter_get();
+extern uintptr_t program_counter_get(void);
 
 extern bool kernel_frame_pointer_validate(uintptr_t);