Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932576AbWAFCPz (ORCPT ); Thu, 5 Jan 2006 21:15:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932578AbWAFCOR (ORCPT ); Thu, 5 Jan 2006 21:14:17 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:53458 "EHLO e33.co.us.ibm.com") by vger.kernel.org with ESMTP id S932576AbWAFCON (ORCPT ); Thu, 5 Jan 2006 21:14:13 -0500 Date: Thu, 5 Jan 2006 19:14:01 -0700 From: john stultz To: akpm@osdl.org Cc: lkml , Ingo Molnar , George Anzinger , Roman Zippel , Ulrich Windl , Thomas Gleixner , Steven Rostedt , john stultz Message-Id: <20060106021401.6714.11426.sendpatchset@cog.beaverton.ibm.com> In-Reply-To: <20060106021328.6714.45831.sendpatchset@cog.beaverton.ibm.com> References: <20060106021328.6714.45831.sendpatchset@cog.beaverton.ibm.com> Subject: [PATCH 5/10] Time: i386 Conversion - part 1: Move timer_pit.c to i8253.c Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3325 Lines: 112 This patch is just a simple cleanup for the i386 arch in preparation of moving to the generic timeofday infrastructure. It simply moves the PIT initialization code, locks, and other code we want to keep from some code from timer_pit.c (which will be removed) to i8253.c. thanks -john Signed-off-by: John Stultz Makefile | 2 +- i8253.c | 32 ++++++++++++++++++++++++++++++++ time.c | 5 ----- timers/timer_pit.c | 13 ------------- 4 files changed, 33 insertions(+), 19 deletions(-) linux-2.6.15-rc5_timeofday-arch-i386-part1_B15.patch ============================================ diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index f10de0f..7bc053f 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ - doublefault.o quirks.o i8237.o + doublefault.o quirks.o i8237.o i8253.o obj-y += cpu/ obj-y += timers/ diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c new file mode 100644 index 0000000..29cb2eb --- /dev/null +++ b/arch/i386/kernel/i8253.c @@ -0,0 +1,32 @@ +/* + * i8253.c 8253/PIT functions + * + */ +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "io_ports.h" + +DEFINE_SPINLOCK(i8253_lock); +EXPORT_SYMBOL(i8253_lock); + +void setup_pit_timer(void) +{ + unsigned long flags; + + spin_lock_irqsave(&i8253_lock, flags); + outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + udelay(10); + outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ + udelay(10); + outb(LATCH >> 8 , PIT_CH0); /* MSB */ + spin_unlock_irqrestore(&i8253_lock, flags); +} diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 41c5b2d..6b0d4eb 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -82,11 +82,6 @@ extern unsigned long wall_jiffies; DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -#include - -DEFINE_SPINLOCK(i8253_lock); -EXPORT_SYMBOL(i8253_lock); - struct timer_opts *cur_timer __read_mostly = &timer_none; /* diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c index b9b6bd5..44cbdf9 100644 --- a/arch/i386/kernel/timers/timer_pit.c +++ b/arch/i386/kernel/timers/timer_pit.c @@ -162,16 +162,3 @@ struct init_timer_opts __initdata timer_ .init = init_pit, .opts = &timer_pit, }; - -void setup_pit_timer(void) -{ - unsigned long flags; - - spin_lock_irqsave(&i8253_lock, flags); - outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ - udelay(10); - outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ - udelay(10); - outb(LATCH >> 8 , PIT_CH0); /* MSB */ - spin_unlock_irqrestore(&i8253_lock, flags); -} - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/