Changes in kernel/arch/arm32/src/ras.c [9d58539:b0c2075] in mainline

File:

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

kernel/arch/arm32/src/ras.c

@@ -51 +51 @@
 void ras_init(void)
 {
-        uintptr_t frame;
-
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_ATOMIC | FRAME_HIGHMEM);
+        uintptr_t frame =
+            frame_alloc(1, FRAME_ATOMIC | FRAME_HIGHMEM, 0);
         if (!frame)
-                frame = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_LOWMEM);
+                frame = frame_alloc(1, FRAME_LOWMEM, 0);
+        
         ras_page = (uintptr_t *) km_map(frame,
             PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE);
-
+        
         memsetb(ras_page, PAGE_SIZE, 0); 
         ras_page[RAS_START] = 0;
@@ -67 +66 @@
 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 +73 @@
                         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;
 }