Changeset 69c1995 in mainline for kernel/arch/arm32/src/ras.c
- Timestamp:
- 2012-11-29T12:53:45Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e80d8f8
- Parents:
- 3194d83 (diff), ce60be1 (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
r3194d83 r69c1995 67 67 void ras_check(unsigned int n, istate_t *istate) 68 68 { 69 uintptr_t rewrite_pc = istate->pc;69 bool restart = false; 70 70 71 71 if (istate_from_uspace(istate)) { … … 73 73 if ((ras_page[RAS_START] < istate->pc) && 74 74 (ras_page[RAS_END] > istate->pc)) { 75 re write_pc = ras_page[RAS_START];75 restart = true; 76 76 } 77 77 ras_page[RAS_START] = 0; 78 78 ras_page[RAS_END] = 0xffffffff; 79 } 79 } 80 80 } 81 81 82 82 exc_dispatch(n, istate); 83 84 istate->pc = rewrite_pc;83 if (restart) 84 istate->pc = ras_page[RAS_START]; 85 85 } 86 86
Note:
See TracChangeset
for help on using the changeset viewer.