Commit:     a57dae3aa4d00a000b5bac4238025438204c78b2
Parent:     b5556a67f08559b6c1597f6396c1f9ef460f62b4
Author:     Roland McGrath <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 22:39:45 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Feb 6 22:39:45 2008 +0100

    x86: fix iret exception recovery on 64-bit
    This change broke recovery of exceptions in iret:
       commit 72fe4858544292ad64600765cb78bc02298c6b1c
       Author: Glauber de Oliveira Costa <[EMAIL PROTECTED]>
           x86: replace privileged instructions with paravirt macros
    The ENTRY(native_iret) macro adds alignment padding before the iretq
    instruction, so "iret_label" no longer points exactly at the instruction.
    It was sloppy to leave the old "iret_label" label behind when replacing
    its nearby use.  Removing it would have revealed the other use of the
    label later in the file, and upon noticing that use, anyone exercising
    the minimum of attention to detail expected of anyone touching this
    subtle code would realize it needed to change as well.
    Signed-off-by: Roland McGrath <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
 arch/x86/kernel/entry_64.S |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index e518928..c7341e8 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -582,7 +582,6 @@ retint_restore_args:        /* return to kernel space */
        RESTORE_ARGS 0,8,0                                              
@@ -920,7 +919,7 @@ error_kernelspace:
           iret run with kernel gs again, so don't set the user space flag.
           B stepping K8s sometimes report an truncated RIP for IRET 
           exceptions returning to compat mode. Check for these here too. */
-       leaq iret_label(%rip),%rbp
+       leaq native_iret(%rip),%rbp
        cmpq %rbp,RIP(%rsp) 
        je   error_swapgs
        movl %ebp,%ebp  /* zero extend */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to