Procházet zdrojové kódy

arch/i386/kernel/time: don't shadow 'irq' function arg

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Jeff Garzik před 18 roky
rodič
revize
86d91bab48
1 změnil soubory, kde provedl 2 přidání a 2 odebrání
  1. 2 2
      arch/i386/kernel/time.c

+ 2 - 2
arch/i386/kernel/time.c

@@ -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,
 		high bit of the PPI port B (0x61).  Note that some PS/2s,
 		notably the 55SX, work fine if this is removed.  */
 		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);
 	write_sequnlock(&xtime_lock);