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

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

Drop unused variables.

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 157bbd3099524d966686bf974c90e033caaf2843..9d822af70fcbb3b5a21b01accbfb90121011aae3 100644 (file)
--- 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 3bdabc3f8f148c370cef9664c9f47ec04d0a5ef9..d201c60ac5c2f2cfcbddb4a0e1bfbc5275daa9de 100644 (file)
--- 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 24c7a7fe18ae7e97f45f2d58c926978b3e374652..ee8ffde28fa794b934edf9bd8a36b2acd7b415f9 100644 (file)
--- 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