Commit c73dbf24 authored by Linus Torvalds's avatar Linus Torvalds

Clean up after timers - move the "timers" Makefile info

into the proper subdirectory (kernel) where it is used.

Drop unused variables.
parent 21872250
...@@ -52,8 +52,9 @@ endif ...@@ -52,8 +52,9 @@ endif
HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
libs-y += arch/i386/lib/ libs-y += arch/i386/lib/
core-y += arch/i386/kernel/ arch/i386/mm/ \ core-y += arch/i386/kernel/ \
arch/i386/$(MACHINE)/ arch/i386/kernel/timers/ arch/i386/mm/ \
arch/i386/$(MACHINE)/
drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/ drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/
drivers-$(CONFIG_PCI) += arch/i386/pci/ drivers-$(CONFIG_PCI) += arch/i386/pci/
......
...@@ -12,6 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ...@@ -12,6 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
bootflag.o bootflag.o
obj-y += cpu/ obj-y += cpu/
obj-y += timers/
obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
obj-$(CONFIG_MCA) += mca.o obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
......
...@@ -268,8 +268,6 @@ static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *reg ...@@ -268,8 +268,6 @@ static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *reg
#endif #endif
} }
static int use_tsc;
/* /*
* This is the same as the above, except we _also_ save the current * This is the same as the above, except we _also_ save the current
* Time Stamp Counter value at the time of the timer interrupt, so that * Time Stamp Counter value at the time of the timer interrupt, so that
...@@ -277,8 +275,6 @@ static int use_tsc; ...@@ -277,8 +275,6 @@ static int use_tsc;
*/ */
void timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) void timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
int count;
/* /*
* Here we are in the timer irq handler. We just have irqs locally * Here we are in the timer irq handler. We just have irqs locally
* disabled but we don't know if the timer_bh is running on the other * disabled but we don't know if the timer_bh is running on the other
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment