diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2008-01-30 13:33:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:10 +0100 |
| commit | 9718769d298f8642d5ef41eb5f55669d7c5b9fd6 (patch) | |
| tree | 466491e290a48b03426b9ee20ab364f53b8efb55 /arch/x86/kernel/ioport.c | |
| parent | x86: ioport_{32|64}.c unification (diff) | |
| download | linux-9718769d298f8642d5ef41eb5f55669d7c5b9fd6.tar.xz linux-9718769d298f8642d5ef41eb5f55669d7c5b9fd6.zip | |
x86: fix ioport unification on 32-bit
ioport unification was broken for 32-bit; it was missing
the acutal pushf/popf EFLAGS manipulation (set_iopl_mask()).
Also, use of volatile looks like leftover cruft.
Cc: mboton@gmail.com
Cc: Kevin Winchester <kjwinchester@gmail.com>
Cc: Zach Brown <zach.brown@oracle.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/ioport.c')
| -rw-r--r-- | arch/x86/kernel/ioport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c index e723ff3b1d53..be72d809bce7 100644 --- a/arch/x86/kernel/ioport.c +++ b/arch/x86/kernel/ioport.c @@ -116,9 +116,10 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) #ifdef CONFIG_X86_32 asmlinkage long sys_iopl(unsigned long regsp) { - volatile struct pt_regs *regs = (struct pt_regs *)®sp; + struct pt_regs *regs = (struct pt_regs *)®sp; unsigned int level = regs->bx; unsigned int old = (regs->flags >> 12) & 3; + struct thread_struct *t = ¤t->thread; if (level > 3) return -EINVAL; @@ -127,8 +128,9 @@ asmlinkage long sys_iopl(unsigned long regsp) if (!capable(CAP_SYS_RAWIO)) return -EPERM; } + t->iopl = level << 12; regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); - + set_iopl_mask(t->iopl); return 0; } #else |