Changeset 2b95d13 in mainline for kernel/arch/arm32/src/ras.c
- Timestamp:
- 2013-03-12T21:07:15Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 606f6a1
- Parents:
- 976c434 (diff), eceff5f (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/ras.c
r976c434 r2b95d13 67 67 void ras_check(unsigned int n, istate_t *istate) 68 68 { 69 bool restart = false; 69 bool restart_needed = false; 70 uintptr_t restart_pc = 0; 70 71 71 72 if (istate_from_uspace(istate)) { … … 73 74 if ((ras_page[RAS_START] < istate->pc) && 74 75 (ras_page[RAS_END] > istate->pc)) { 75 restart = true; 76 restart_needed = true; 77 restart_pc = ras_page[RAS_START]; 76 78 } 77 79 ras_page[RAS_START] = 0; … … 81 83 82 84 exc_dispatch(n, istate); 83 if (restart )84 istate->pc = r as_page[RAS_START];85 if (restart_needed) 86 istate->pc = restart_pc; 85 87 } 86 88
Note:
See TracChangeset
for help on using the changeset viewer.