Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-12-17 12:02:30 +0100
committerJiri Kosina <jkosina@suse.cz>2014-12-17 12:04:10 +0100
commit563dee91d29887a74c9386444ed4ae616081ec4a (patch)
tree6fbd971e4b7d46bd483798e30ba910ad13ece4ba
parent5c5f7b79a8ed73aabdf13d87ef05083d96922c82 (diff)
x86, asm, xen: Flip RESTORE_ARGS arguments logic (bnc#910251rpm-3.0.101-0.46
-rw-r--r--arch/x86/kernel/entry_64-xen.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/entry_64-xen.S b/arch/x86/kernel/entry_64-xen.S
index 46b5fad54e1b..665ef7c283ed 100644
--- a/arch/x86/kernel/entry_64-xen.S
+++ b/arch/x86/kernel/entry_64-xen.S
@@ -519,7 +519,7 @@ sysret_check:
* sysretq will re-enable interrupts:
*/
TRACE_IRQS_ON
- RESTORE_ARGS 0,8,1,1
+ RESTORE_ARGS 1,8,0,0
xor %ecx,%ecx
xor %r11,%r11
HYPERVISOR_IRET VGCF_IN_SYSCALL
@@ -775,7 +775,7 @@ retint_restore_args: /* return to kernel space */
andb $1,%al # EAX[0] == IRET_EFLAGS.IF & event_mask
jnz restore_all_enable_events # != 0 => enable event delivery
- RESTORE_ARGS 0,8,0
+ RESTORE_ARGS 1,8,1
HYPERVISOR_IRET 0
/* edi: workmask, edx: work */
@@ -1010,7 +1010,7 @@ scrit: /**** START OF CRITICAL REGION ****/
__TEST_PENDING
CFI_REMEMBER_STATE
jnz 14f # process more events if necessary...
- RESTORE_ARGS 0,8,0
+ RESTORE_ARGS 1,8,1
HYPERVISOR_IRET 0
CFI_RESTORE_STATE