projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-v3.19/omap-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw...
[cascardo/linux.git]
/
arch
/
x86
/
ia32
/
ia32entry.S
diff --git
a/arch/x86/ia32/ia32entry.S
b/arch/x86/ia32/ia32entry.S
index
8ffba18
..
ffe7122
100644
(file)
--- a/
arch/x86/ia32/ia32entry.S
+++ b/
arch/x86/ia32/ia32entry.S
@@
-157,7
+157,7
@@
ENTRY(ia32_sysenter_target)
* ourselves. To save a few cycles, we can check whether
* NT was set instead of doing an unconditional popfq.
*/
* ourselves. To save a few cycles, we can check whether
* NT was set instead of doing an unconditional popfq.
*/
- testl $X86_EFLAGS_NT,EFLAGS
(%rsp) /* saved EFLAGS match cpu */
+ testl $X86_EFLAGS_NT,EFLAGS
-ARGOFFSET(%rsp)
jnz sysenter_fix_flags
sysenter_flags_fixed:
jnz sysenter_fix_flags
sysenter_flags_fixed: