Changeset 8ab339e in mainline for kernel/arch/amd64/include/istate.h

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (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:

• kernel/arch/amd64/include/istate.h (modified) (1 diff)

kernel/arch/amd64/include/istate.h

@@ -66 +66 @@
 } istate_t;
 
+#define RPL_USER        3
+
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->rip & UINT64_C(0x8000000000000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }