Merge branch 'iov_iter' into for-next

This commit is contained in:
Al Viro
2014-12-08 20:39:29 -05:00
1101 changed files with 10898 additions and 7935 deletions
+1 -1
View File
@@ -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.
*/
testl $X86_EFLAGS_NT,EFLAGS(%rsp) /* saved EFLAGS match cpu */
testl $X86_EFLAGS_NT,EFLAGS-ARGOFFSET(%rsp)
jnz sysenter_fix_flags
sysenter_flags_fixed: