aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-09 19:54:08 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-12-09 19:54:08 -0500
commitfc380ceed7fe469728ea4acdbda4495ea943ee1c (patch)
tree84d5ce2358c5812546887ea8ba3bccf3b90f925d /arch/x86
parentce9119ad90b1caba550447bfcc0a21850558ca49 (diff)
x86-64, paravirt: Call set_iopl_mask() on 64 bits
set_iopl_mask() is a no-op on 64 bits, but it is also a paravirt hook, so call it even on 64 bits. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Brian Gerst <brgerst@gmail.com> LKML-Reference: <1260403316-5679-3-git-send-email-brgerst@gmail.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/ioport.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index 85ecc7c57ba6..8eec0ec59af2 100644
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -116,10 +116,8 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
116 return -EPERM; 116 return -EPERM;
117 } 117 }
118 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 118 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
119#ifdef CONFIG_X86_32
120 t->iopl = level << 12; 119 t->iopl = level << 12;
121 set_iopl_mask(t->iopl); 120 set_iopl_mask(t->iopl);
122#endif
123 121
124 return 0; 122 return 0;
125} 123}