arch/i386/kernel/time: don't shadow 'irq' function arg
authorJeff Garzik <jeff@garzik.org>
Fri, 6 Oct 2006 17:32:44 +0000 (13:32 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 6 Oct 2006 17:32:44 +0000 (13:32 -0400)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
arch/i386/kernel/time.c

index 3f221f5eb47ee690612657eb0fede58f7d1e813f..78af572fd17c3e4a903aaf59062744455808e77a 100644 (file)
@@ -201,8 +201,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
                high bit of the PPI port B (0x61).  Note that some PS/2s,
                notably the 55SX, work fine if this is removed.  */
 
-               irq = inb_p( 0x61 );    /* read the current state */
-               outb_p( irq|0x80, 0x61 );       /* reset the IRQ */
+               u8 irq_v = inb_p( 0x61 );       /* read the current state */
+               outb_p( irq_v|0x80, 0x61 );     /* reset the IRQ */
        }
 
        write_sequnlock(&xtime_lock);