]> git.baikalelectronics.ru Git - kernel.git/commit
x86: fix iret exception recovery on 64-bit
authorRoland McGrath <roland@redhat.com>
Wed, 6 Feb 2008 21:39:45 +0000 (22:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 6 Feb 2008 21:39:45 +0000 (22:39 +0100)
commit4b84a17d4e61d1c7926c009c3e8b8a95f1be23f4
tree03a22973e807fa9607ae7deb60c2939f1b8863d1
parentf0311bc8c6865164028ab8fc5915c890a5bbc497
x86: fix iret exception recovery on 64-bit

This change broke recovery of exceptions in iret:

   commit 849654f2288c2d1025cf9a4471ae4cd179795db4
   Author: Glauber de Oliveira Costa <gcosta@redhat.com>

       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 <roland@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/entry_64.S