From c73dbf246c80ada6d43cdc607776a8d27fd9aa36 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 9 Oct 2002 22:28:34 -0700 Subject: [PATCH] Clean up after timers - move the "timers" Makefile info into the proper subdirectory (kernel) where it is used. Drop unused variables. --- arch/i386/Makefile | 5 +++-- arch/i386/kernel/Makefile | 1 + arch/i386/kernel/time.c | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 157bbd309952..9d822af70fcb 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -52,8 +52,9 @@ endif HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o libs-y += arch/i386/lib/ -core-y += arch/i386/kernel/ arch/i386/mm/ \ - arch/i386/$(MACHINE)/ arch/i386/kernel/timers/ +core-y += arch/i386/kernel/ \ + arch/i386/mm/ \ + arch/i386/$(MACHINE)/ drivers-$(CONFIG_MATH_EMULATION) += arch/i386/math-emu/ drivers-$(CONFIG_PCI) += arch/i386/pci/ diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 3bdabc3f8f14..d201c60ac5c2 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -12,6 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ bootflag.o obj-y += cpu/ +obj-y += timers/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-$(CONFIG_MCA) += mca.o obj-$(CONFIG_X86_MSR) += msr.o diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 24c7a7fe18ae..ee8ffde28fa7 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -268,8 +268,6 @@ static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *reg #endif } -static int use_tsc; - /* * 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 @@ -277,8 +275,6 @@ static int use_tsc; */ 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 * disabled but we don't know if the timer_bh is running on the other -- 2.39.5