Make sure to check whether we're coming from usermode on i386 too.
Merge branch '20140223-fasttrap-intr-disabled' into markj-develop