Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d016ef1 authored by John Stultz's avatar John Stultz Committed by Linus Torvalds
Browse files

[PATCH] Time: i386 Conversion - part 1: Move timer_pit.c to i8253.c 



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.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ede65f39

arch/i386/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds 
obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \

		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \

		pci-dma.o i386_ksyms.o i387.o bootflag.o \

		quirks.o i8237.o topology.o alternative.o

		quirks.o i8237.o topology.o alternative.o i8253.o



obj-y				+= cpu/

obj-y				+= timers/

arch/i386/kernel/i8253.c

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * i8253.c  8253/PIT functions

 *

 */

#include <linux/spinlock.h>

#include <linux/jiffies.h>

#include <linux/sysdev.h>

#include <linux/module.h>

#include <linux/init.h>



#include <asm/smp.h>

#include <asm/delay.h>

#include <asm/i8253.h>

#include <asm/io.h>



#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);

}

arch/i386/kernel/time.c

+0 −5
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ extern unsigned long wall_jiffies; 
DEFINE_SPINLOCK(rtc_lock);

EXPORT_SYMBOL(rtc_lock);



#include <asm/i8253.h>



DEFINE_SPINLOCK(i8253_lock);

EXPORT_SYMBOL(i8253_lock);



struct timer_opts *cur_timer __read_mostly = &timer_none;



/*

arch/i386/kernel/timers/timer_pit.c

+0 −13
Original line number Diff line number Diff line
@@ -162,16 +162,3 @@ struct init_timer_opts __initdata timer_pit_init = { 
	.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);

}