Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 9ad289d in mainline for kernel/arch/amd64/include/istate.h


Ignore:
Timestamp:
2013-02-23T14:04:55Z (9 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master
Children:
088b334
Parents:
3acd1bb (diff), df64dbc (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/include/istate.h

    r3acd1bb r9ad289d  
    6666} istate_t;
    6767
     68#define RPL_USER        3
     69
    6870/** Return true if exception happened while in userspace */
    6971NO_TRACE static inline int istate_from_uspace(istate_t *istate)
    7072{
    71         return !(istate->rip & UINT64_C(0x8000000000000000));
     73        return (istate->cs & RPL_USER) == RPL_USER;
    7274}
    7375
Note: See TracChangeset for help on using the changeset viewer.