Changeset 25eec4e in mainline for kernel/arch/amd64/include/arch/istate.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

kernel/arch/amd64/include/arch/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;
 }