diff --git a/[refs] b/[refs] index 1733ba84f7ce..5080a0ca6896 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8e0870f589cfa45575dc7333cdf1b8f769e7900 +refs/heads/master: 85cea51d7e7b8d3408c8e933d88fa067309395fa diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S index c5fe01bca6c0..49438e58291d 100644 --- a/trunk/arch/x86/kernel/entry_32.S +++ b/trunk/arch/x86/kernel/entry_32.S @@ -730,6 +730,7 @@ error_code: movl $(__USER_DS), %ecx movl %ecx, %ds movl %ecx, %es + TRACE_IRQS_OFF movl %esp,%eax # pt_regs pointer call *%edi jmp ret_from_exception