summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-06 13:32:44 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-06 13:32:44 -0400
commit86d91bab4806191a8126502d80d729c2a4765ebe (patch)
tree1f5aa8a8566bc23db6b177117d1e53d3324602b5 /arch/i386
parent49f19ce401edfff937c448dd74c22497da361889 (diff)
arch/i386/kernel/time: don't shadow 'irq' function arg
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 3f221f5eb47..78af572fd17 100644
--- a/arch/i386/kernel/time.c
+++ b/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,
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);