[PATCH] x86: entry.S trap return fixes