Changeset 69c1995 in mainline for kernel/arch/arm32/src/ras.c


Ignore:
Timestamp:
2012-11-29T12:53:45Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
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.
Message:

Merge ARM fpu hw support.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/src/ras.c

    r3194d83 r69c1995  
    6767void ras_check(unsigned int n, istate_t *istate)
    6868{
    69         uintptr_t rewrite_pc = istate->pc;
     69        bool restart = false;
    7070
    7171        if (istate_from_uspace(istate)) {
     
    7373                        if ((ras_page[RAS_START] < istate->pc) &&
    7474                            (ras_page[RAS_END] > istate->pc)) {
    75                                 rewrite_pc = ras_page[RAS_START];
     75                                restart = true;
    7676                        }
    7777                        ras_page[RAS_START] = 0;
    7878                        ras_page[RAS_END] = 0xffffffff;
    79                 }       
     79                }
    8080        }
    8181
    8282        exc_dispatch(n, istate);
    83 
    84         istate->pc = rewrite_pc;
     83        if (restart)
     84                istate->pc = ras_page[RAS_START];
    8585}
    8686
Note: See TracChangeset for help on using the changeset viewer.