projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'upstream-x86-entry' into WIP.x86/mm
[linux-2.6-microblaze.git]
/
arch
/
x86
/
entry
/
entry_64_compat.S
diff --git
a/arch/x86/entry/entry_64_compat.S
b/arch/x86/entry/entry_64_compat.S
index
b5c7a56
..
568e130
100644
(file)
--- a/
arch/x86/entry/entry_64_compat.S
+++ b/
arch/x86/entry/entry_64_compat.S
@@
-337,8
+337,7
@@
ENTRY(entry_INT80_compat)
/* Go back to user mode. */
TRACE_IRQS_ON
- SWAPGS
- jmp restore_regs_and_iret
+ jmp swapgs_restore_regs_and_return_to_usermode
END(entry_INT80_compat)
ENTRY(stub32_clone)