Changeset 03362fbd in mainline for kernel/arch/arm32/src/ras.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/arch/arm32/src/ras.c (modified) (2 diffs)

kernel/arch/arm32/src/ras.c

@@ -67 +67 @@
 void ras_check(unsigned int n, istate_t *istate)
 {
-        uintptr_t rewrite_pc = istate->pc;
+        bool restart_needed = false;
+        uintptr_t restart_pc = 0;
 
         if (istate_from_uspace(istate)) {
@@ -73 +74 @@
                         if ((ras_page[RAS_START] < istate->pc) &&
                             (ras_page[RAS_END] > istate->pc)) {
-                                rewrite_pc = ras_page[RAS_START];
+                                restart_needed = true;
+                                restart_pc = ras_page[RAS_START];
                         }
                         ras_page[RAS_START] = 0;
                         ras_page[RAS_END] = 0xffffffff;
-                }       
+                }
         }
 
         exc_dispatch(n, istate);
-
-        istate->pc = rewrite_pc;
+        if (restart_needed)
+                istate->pc = restart_pc;
 }