Fixed code according to Bjoern's suggestions.

Renamed function in timer.c, removed personal EXTRAVERSION from Makefile,
changed some other small things. Aligned and staggered quanta are now
working properly, Use quanta=staggered as a boot option to get staggered
quanta, and no boot option (or quanta=aligned) to get aligned quanta. In
most cases, quantum alignments are even more precise now than they were
previously (less than 5 microseconds versus 10-20 microseconds).

3 files changed, 7 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 6c433547cd..7e2750f4ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = -jmc
+EXTRAVERSION =
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 31be749513..0a050f7e75 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -1256,7 +1256,8 @@ void synchronize_quanta(void)
                 udelay(1);
         }
         __setup_APIC_LVTT(calibration_result);
-        enable_APIC_timer();
+        if (!stagger)
+                enable_APIC_timer();
 
         /*
          * Add necessary stagger for this CPU, if required. Do _not_
@@ -1268,7 +1269,6 @@ void synchronize_quanta(void)
          */
         if (stagger) {
                 int stagger_us = cpu * stagger_interval;
-                disable_APIC_timer();
                 udelay(stagger_us);
                 __setup_APIC_LVTT(calibration_result);
                 enable_APIC_timer();
@@ -1279,8 +1279,8 @@ void synchronize_quanta(void)
                 /*
                  * FIXME: wraparound issue prevents periodic re-synch.
                  */
-//              atomic_add(msecs_to_jiffies(WAIT_TO_SYNC), &qsync_time);
-//              atomic_inc(&barrier_use_count);
+/*              atomic_add(msecs_to_jiffies(WAIT_TO_SYNC), &qsync_time); */
+/*              atomic_inc(&barrier_use_count); */
         }
 }
 
@@ -1306,7 +1306,7 @@ inline void smp_local_timer_interrupt(void)
          * This won't always work, but we just want enough samples
          * to figure out what's going on.
          */
-        offset = public_get_nsec_offset();
+        offset = get_nsec_offset();
         if (jiffies % 10 == 0 && time_after(jiffies, 
             (unsigned long)(INITIAL_JIFFIES + msecs_to_jiffies(WAIT_TO_SYNC))))
                 TRACE("%d, %d: %lld\n", smp_processor_id(), jiffies, offset);
diff --git a/kernel/timer.c b/kernel/timer.c
index 1d42f52cad..532fdde9ba 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -743,7 +743,7 @@ static inline s64 __get_nsec_offset(void)
  * timestamp without locking. (We can't lock and are only reading,
  * so it can only hurt us, not others.)
  */
-s64 public_get_nsec_offset(void)
+s64 get_nsec_offset(void)
 {
         cycle_t cycle_now, cycle_delta;
         s64 ns_offset;
@@ -759,7 +759,6 @@ s64 public_get_nsec_offset(void)
 
         return ns_offset;
 }
-EXPORT_SYMBOL(public_get_nsec_offset);
 
 /**
  * __get_realtime_clock_ts - Returns the time of day in a timespec