x86: unexport io_delay_type

[safe/jmp/linux-2.6] / arch / x86 / kernel / ioport.c

diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index e723ff3..50e5e4a 100644 (file)
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -113,11 +113,8 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
  * on system-call entry - see also fork() and the signal handling
  * code.
  */
-#ifdef CONFIG_X86_32
-asmlinkage long sys_iopl(unsigned long regsp)
+static int do_iopl(unsigned int level, struct pt_regs *regs)
 {
-       volatile struct pt_regs *regs = (struct pt_regs *)&regsp;
-       unsigned int level = regs->bx;
        unsigned int old = (regs->flags >> 12) & 3;
 
        if (level > 3)
@@ -131,20 +128,27 @@ asmlinkage long sys_iopl(unsigned long regsp)
 
        return 0;
 }
-#else
-asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
+
+#ifdef CONFIG_X86_32
+asmlinkage long sys_iopl(unsigned long regsp)
 {
-       unsigned int old = (regs->flags >> 12) & 3;
+       struct pt_regs *regs = (struct pt_regs *)&regsp;
+       unsigned int level = regs->bx;
+       struct thread_struct *t = &current->thread;
+       int rc;
 
-       if (level > 3)
-               return -EINVAL;
-       /* Trying to gain more privileges? */
-       if (level > old) {
-               if (!capable(CAP_SYS_RAWIO))
-                       return -EPERM;
-       }
-       regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
+       rc = do_iopl(level, regs);
+       if (rc < 0)
+               goto out;
 
-       return 0;
+       t->iopl = level << 12;
+       set_iopl_mask(t->iopl);
+out:
+       return rc;
+}
+#else
+asmlinkage long sys_iopl(unsigned int level, struct pt_regs *regs)
+{
+       return do_iopl(level, regs);
 }
 #endif