Index: kernel/arch/ia32/include/istate.h
===================================================================
--- kernel/arch/ia32/include/istate.h	(revision 4a5ba372d36c7898a9b57089ec4811f25445de77)
+++ kernel/arch/ia32/include/istate.h	(revision 088b33443bffe958b7f9121e9b4dfa4228b29516)
@@ -68,8 +68,10 @@
 } 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->eip & UINT32_C(0x80000000));
+	return (istate->cs & RPL_USER) == RPL_USER;
 }