diff --git a/[refs] b/[refs] index 7f52bcc60b1b..00915bff6fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a62eaf151d9cb478d127cfbc2e93c498869785b0 +refs/heads/master: 2391c4b594eb28abd58102de8f4e5d7a4fa39f4c diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index b150c87a08c6..7c10e9009d61 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/arch/x86_64/kernel/entry.S @@ -554,6 +554,7 @@ iret_label: /* running with kernel gs */ bad_iret: movq $-9999,%rdi /* better code? */ + sti jmp do_exit .previous