git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull fluff into release branch
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
ioport.c
diff --git
a/arch/x86_64/kernel/ioport.c
b/arch/x86_64/kernel/ioport.c
index fe063d3cfe42b7ff8c09184cd6986492cce01eeb..745b1f0f494ecdaa2dffce605549c127a52df567 100644
(file)
--- a/
arch/x86_64/kernel/ioport.c
+++ b/
arch/x86_64/kernel/ioport.c
@@
-114,6
+114,6
@@
asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
- regs->eflags = (regs->eflags &~
0x3000U
L) | (level << 12);
+ regs->eflags = (regs->eflags &~
X86_EFLAGS_IOP
L) | (level << 12);
return 0;
}