From be1fa33f09a490a93781e1f7785615c074dfdfd4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 9 Jun 2011 13:08:30 +0000 Subject: [PATCH] --- yaml --- r: 257199 b: refs/heads/master c: 01898e3e29ea8242d81923da11ce88ba71290a48 h: refs/heads/master i: 257197: 6d5383fbd33f93d8c4d5466af92e117f3d4af584 257195: 855007b47bdc8d8b4031a10ff70ddb0c257000b7 257191: 8496752ed68682049cb346d9052745eee8b3ffa0 257183: 9b1cef1fd3a1b188f8cffee45566fb64a5597b63 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apm_32.c | 6 +++--- trunk/include/linux/i8253.h | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2dc4bae5288c..7403adedc6a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8560a6cfc9818edde1fd8677961714b264ffa03d +refs/heads/master: 01898e3e29ea8242d81923da11ce88ba71290a48 diff --git a/trunk/arch/x86/kernel/apm_32.c b/trunk/arch/x86/kernel/apm_32.c index a30740e6890e..0371c484bb8a 100644 --- a/trunk/arch/x86/kernel/apm_32.c +++ b/trunk/arch/x86/kernel/apm_32.c @@ -1220,11 +1220,11 @@ static void reinit_timer(void) raw_spin_lock_irqsave(&i8253_lock, flags); /* set the clock to HZ */ - outb_pit(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ udelay(10); - outb_pit(LATCH & 0xff, PIT_CH0); /* LSB */ + outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ udelay(10); - outb_pit(LATCH >> 8, PIT_CH0); /* MSB */ + outb_p(LATCH >> 8, PIT_CH0); /* MSB */ udelay(10); raw_spin_unlock_irqrestore(&i8253_lock, flags); #endif diff --git a/trunk/include/linux/i8253.h b/trunk/include/linux/i8253.h index 487d50c7db39..e6bb36a97519 100644 --- a/trunk/include/linux/i8253.h +++ b/trunk/include/linux/i8253.h @@ -20,9 +20,6 @@ #define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ) -#define inb_pit inb_p -#define outb_pit outb_p - extern raw_spinlock_t i8253_lock; extern struct clock_event_device i8253_clockevent; extern void clockevent_i8253_init(bool oneshot);