Changeset 3f03199 in mainline for kernel/generic/src/debug/stacktrace.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/generic/src/debug/stacktrace.c (modified) (2 diffs)

kernel/generic/src/debug/stacktrace.c

@@ -39 +39 @@
 #include <print.h>
 
-#define STACK_FRAMES_MAX        20
+#define STACK_FRAMES_MAX  20
 
 void stack_trace_ctx(stack_trace_ops_t *ops, stack_trace_context_t *ctx)
@@ -49 +49 @@
         uintptr_t pc;
         
-        while (cnt++ < STACK_FRAMES_MAX &&
-            ops->stack_trace_context_validate(ctx)) {
+        while ((cnt++ < STACK_FRAMES_MAX) &&
+            (ops->stack_trace_context_validate(ctx))) {
                 if (ops->symbol_resolve &&
                     ops->symbol_resolve(ctx->pc, &symbol, &offset)) {