Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into...

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / ioport.c

diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index 19191430274496e8d04f4bd4e165f852e6753560..99c4d308f16b0db61ca0821adca78d3bec2e8b96 100644 (file)
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -35,8 +35,8 @@ static void set_bitmap(unsigned long *bitmap, unsigned int base,
  */
 asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 {
-       struct thread_struct * t = &current->thread;
-       struct tss_struct * tss;
+       struct thread_struct *t = &current->thread;
+       struct tss_struct *tss;
        unsigned int i, max_long, bytes, bytes_updated;
 
        if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
@@ -85,19 +85,8 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 
        t->io_bitmap_max = bytes;
 
-#ifdef CONFIG_X86_32
-       /*
-        * Sets the lazy trigger so that the next I/O operation will
-        * reload the correct bitmap.
-        * Reset the owner so that a process switch will not set
-        * tss->io_bitmap_base to IO_BITMAP_OFFSET.
-        */
-       tss->x86_tss.io_bitmap_base = INVALID_IO_BITMAP_OFFSET_LAZY;
-       tss->io_bitmap_owner = NULL;
-#else
        /* Update the TSS: */
        memcpy(tss->io_bitmap, t->io_bitmap_ptr, bytes_updated);
-#endif
 
        put_cpu();
 
@@ -131,9 +120,8 @@ static int do_iopl(unsigned int level, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_X86_32
-asmlinkage long sys_iopl(unsigned long regsp)
+long sys_iopl(struct pt_regs *regs)
 {
-       struct pt_regs *regs = (struct pt_regs *)&regsp;
        unsigned int level = regs->bx;
        struct thread_struct *t = &current->thread;
        int rc;