Changeset b55877d in mainline

Timestamp:

2012-12-29T20:07:36Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b26396e, b5a3b50

Parents:

c928bb7

Message:

arm32: Do not destroy the restart PC when restarting an atomic sequence.

File:

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

kernel/arch/arm32/src/ras.c

@@ -67 +67 @@
 void ras_check(unsigned int n, istate_t *istate)
 {
-        bool restart = false;
+        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)) {
-                                restart = true;
+                                restart_needed = true;
+                                restart_pc = ras_page[RAS_START];
                         }
                         ras_page[RAS_START] = 0;
@@ -81 +83 @@
 
         exc_dispatch(n, istate);
-        if (restart)
-                istate->pc = ras_page[RAS_START];
+        if (restart_needed)
+                istate->pc = restart_pc;
 }