Move calc_load call out from xtime_lock protection
Subsystems (11)
PATCH 1/1 Move calc_load call out from xtime_lock protection
The xtime_lock is being held for long periods on larger systems due to an extensive amount of time being spent in calc_load(), specifically here:
do_timer->update_times->calc_load->count_active_tasks->nr_active()
On a 64 cpu system I've seen this take approximately 55 usec. Presumably it would be worse on larger systems. This causes other cpus to be held off in places such as scheduler_tick->sched_clock_tick waiting for the xtime_lock to be released.
Why does the xtime_lock need to be held when calc_load() is called? Since the calculation is statistical in nature, it doesn't -seem- to warrant protection via a write lock.
Here's a suggestion for a patch to eliminate this lock contention.
---
This applies to the -tip tree master branch.
Tested on ia64 only.
arch/alpha/kernel/time.c | 1 + arch/arm/kernel/time.c | 1 + arch/arm/mach-clps711x/include/mach/time.h | 2 ++ arch/arm/mach-l7200/include/mach/time.h | 2 ++ arch/blackfin/kernel/time.c | 2 ++ arch/cris/arch-v10/kernel/time.c | 2 ++ arch/cris/arch-v32/kernel/time.c | 1 + arch/frv/kernel/time.c | 1 + arch/h8300/kernel/time.c | 1 + arch/ia64/kernel/time.c | 1 + arch/ia64/xen/time.c | 2 ++ arch/m32r/kernel/time.c | 1 + arch/m68k/kernel/time.c | 1 + arch/m68k/sun3/sun3ints.c | 1 + arch/m68knommu/kernel/time.c | 2 ++ arch/mn10300/kernel/time.c | 1 + arch/parisc/kernel/time.c | 1 + arch/sh/kernel/time_32.c | 1 + arch/sh/kernel/time_64.c | 1 + arch/sparc/kernel/pcic.c | 2 ++ arch/sparc/kernel/time_32.c | 1 + arch/xtensa/kernel/time.c | 2 ++ include/linux/timer.h | 5 +++++ kernel/time/tick-common.c | 1 + kernel/time/tick-sched.c | 3 +++ kernel/timer.c | 4 +--- 26 files changed, 40 insertions(+), 3 deletions(-)
arch/ia64/kernel/time.c +1 -0
@@ -201,6 +201,7 @@ timer_interrupt (int irq, void *dev_id)do_timer (1 ); local_cpu_data->itm_next = new_itm;write_sequnlock (&xtime_lock); +calc_load (1 ); }else local_cpu_data->itm_next = new_itm;
kernel/timer.c +1 -3
@@ -1145,9 +1145,8 @@ EXPORT_SYMBOL(avenrun);/* * calc_load - given tick count, update the avenrun load estimates. -* This is called while holding a write_lock on xtime_lock. */ -static inline void calc_load (unsigned long ticks) +void calc_load (unsigned long ticks) {unsigned long active_tasks;/* fixed-point */ static int count =LOAD_FREQ ;
@@ -1196,7 +1195,6 @@ void run_local_timers(void)static inline void update_times (unsigned long ticks) {update_wall_time (); -calc_load (ticks); }/*
include/linux/timer.h +5 -0
@@ -183,6 +183,11 @@ extern unsigned long next_timer_interrupextern unsigned long get_next_timer_interrupt (unsigned long now);/* +* Calculated load averages. +*/ +extern void calc_load (unsigned long ); + +/* * Timer-statistics info: */ #ifdef CONFIG_TIMER_STATS
kernel/time/tick-common.c +1 -0
@@ -67,6 +67,7 @@ static void tick_periodic(int cpu)do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 ); }update_process_times (user_mode (get_irq_regs ()));
kernel/time/tick-sched.c +3 -0
@@ -81,6 +81,9 @@ static void tick_do_update_jiffies64(kti tick_next_period =ktime_add (last_jiffies_update, tick_period); }write_sequnlock (&xtime_lock); +if (ticks) { +calc_load (ticks); + } }/*
arch/ia64/xen/time.c +2 -0
@@ -23,6 +23,7 @@#include <linux/delay.h> #include <linux/kernel_stat.h> #include <linux/posix-timers.h> +#include <linux/timer.h> #include <linux/irq.h> #include <linux/clocksource.h>
@@ -145,6 +146,7 @@ consider_steal_time(unsigned long new_itdo_timer (stolen + blocked); local_cpu_data->itm_next = delta_itm + new_itm;write_sequnlock (&xtime_lock); +calc_load (stolen + blocked); }else { local_cpu_data->itm_next = delta_itm + new_itm; }
arch/alpha/kernel/time.c +1 -0
@@ -137,6 +137,7 @@ irqreturn_t timer_interrupt(int irq, voi }write_sequnlock (&xtime_lock); +calc_load (nticks);#ifndef CONFIG_SMP while (nticks--)
arch/arm/kernel/time.c +1 -0
@@ -339,6 +339,7 @@ void timer_tick(void)write_seqlock (&xtime_lock);do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/blackfin/kernel/time.c +2 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/profile.h> #include <linux/interrupt.h> +#include <linux/timer.h> #include <linux/time.h> #include <linux/irq.h> #include <linux/delay.h>
@@ -164,6 +165,7 @@ irqreturn_t timer_interrupt(int irq, voi }#endif write_sequnlock (&xtime_lock); +calc_load (1 );#ifdef CONFIG_IPIPE update_root_process_times (get_irq_regs ());
arch/frv/kernel/time.c +1 -0
@@ -97,6 +97,7 @@ static irqreturn_t timer_interrupt(int i#endif /* CONFIG_HEARTBEAT */ write_sequnlock (&xtime_lock); +calc_load (1 );update_process_times (user_mode (get_irq_regs ()));
arch/h8300/kernel/time.c +1 -0
@@ -38,6 +38,7 @@ void h8300_timer_tick(void)write_seqlock (&xtime_lock);do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );update_process_times (user_mode (get_irq_regs ())); }
arch/m32r/kernel/time.c +1 -0
@@ -193,6 +193,7 @@ static irqreturn_t timer_interrupt(int iprofile_tick (CPU_PROFILING );#endif do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/m68k/kernel/time.c +1 -0
@@ -41,6 +41,7 @@ static inline int set_rtc_mmss(unsignedstatic irqreturn_t timer_interrupt (int irq,void *dummy) {do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/m68k/sun3/sun3ints.c +1 -0
@@ -67,6 +67,7 @@ static irqreturn_t sun3_int5(int irq, vointersil_clear ();#endif do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/m68knommu/kernel/time.c +2 -0
@@ -50,6 +50,8 @@ irqreturn_t arch_timer_interrupt(int irqwrite_sequnlock (&xtime_lock); +calc_load (1 ); +#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/mn10300/kernel/time.c +1 -0
@@ -111,6 +111,7 @@ static irqreturn_t timer_interrupt(int i/* advance the kernel's time tracking system */ profile_tick (CPU_PROFILING );do_timer (1 ); +calc_load (1 );check_rtc_time (); }
arch/parisc/kernel/time.c +1 -0
@@ -147,6 +147,7 @@ irqreturn_t timer_interrupt(int irq, voiwrite_seqlock (&xtime_lock);do_timer (ticks_elapsed);write_sequnlock (&xtime_lock); +calc_load (ticks_elapsed); }return IRQ_HANDLED ;
arch/sh/kernel/time_32.c +1 -0
@@ -142,6 +142,7 @@ void handle_timer_tick(void) last_rtc_update = xtime.tv_sec -600 ; }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/sh/kernel/time_64.c +1 -0
@@ -256,6 +256,7 @@ static inline void do_timer_interrupt(vo last_rtc_update = xtime.tv_sec -600 ; }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/sparc/kernel/pcic.c +2 -0
@@ -12,6 +12,7 @@#include <linux/kernel.h> #include <linux/types.h> +#include <linux/timer.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/slab.h>
@@ -707,6 +708,7 @@ static irqreturn_t pcic_timer_handler (ipcic_clear_clock_irq ();do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/sparc/kernel/time_32.c +1 -0
@@ -110,6 +110,7 @@ static irqreturn_t timer_interrupt(int d last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/xtensa/kernel/time.c +2 -0
@@ -13,6 +13,7 @@*/ #include <linux/errno.h> +#include <linux/timer.h> #include <linux/time.h> #include <linux/timex.h> #include <linux/interrupt.h>
@@ -189,6 +190,7 @@ again: last_rtc_update +=60 ; }write_sequnlock (&xtime_lock); +calc_load (1 ); }/* Allow platform to do something useful (Wdog). */
arch/arm/mach-clps711x/include/mach/time.h +2 -0
@@ -17,6 +17,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/timer.h> #include <asm/leds.h> #include <asm/hardware/clps7111.h>
@@ -31,6 +32,7 @@ p720t_timer_interrupt(int irq, void *devstruct pt_regs *regs =get_irq_regs ();do_leds ();do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (regs));#endif
arch/arm/mach-l7200/include/mach/time.h +2 -0
@@ -11,6 +11,7 @@#ifndef _ASM_ARCH_TIME_H#define _ASM_ARCH_TIME_H +#include <linux/timer.h> #include <mach/irqs.h> /*
@@ -47,6 +48,7 @@ timer_interrupt(int irq, void *dev_id) {struct pt_regs *regs =get_irq_regs ();do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (regs));#endif
arch/cris/arch-v10/kernel/time.c +2 -0
@@ -231,6 +231,8 @@ timer_interrupt(int irq, void *dev_id)/* call the real timer interrupt handler */ do_timer (1 ); + +calc_load (1 );cris_do_profile (regs);/* Save profiling information */
arch/cris/arch-v32/kernel/time.c +1 -0
@@ -240,6 +240,7 @@ timer_interrupt(int irq, void *dev_id)/* Call the real timer interrupt handler */ do_timer (1 ); +calc_load (1 );/* * If we have an externally synchronized Linux clock, then update * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
Quoted 11 lines · Dimitri Sivanich
The
xtime_lockis being held for long periods on larger systems due to an extensive amount of time being spent incalc_load(), specifically here:
do_timer->update_times->calc_load->count_active_tasks->nr_active()On a 64 cpu system I've seen this take approximately 55 usec. Presumably it would be worse on larger systems. This causes other cpus to be held off in places such as
scheduler_tick->sched_clock_tickwaiting for thextime_lockto be released.
Quoted 3 lines
Why does the
xtime_lockneed to be held whencalc_load()is called? Since the calculation is statistical in nature, it doesn't -seem- to warrant protection via a write lock.
Hrm.. So its an interesting patch, and anything we can do to reduce xtime_lock write hold times is good, since lots of applications constantly pound on gettimeofday() and friends.
So as far as what's being protected, from my quick audit, its basically just the avenrun[] array (also possibly the static count value in calc_load, but as long as only one cpu calls calc_load, you shouldn't have a race there).
Readers of the avenrun array that might get bad data:
fs/proc/loadavg.c: loadavg_proc_show() kernel/timer.c: do_sysinfo()
Other users (and there are a few) don't take the xtime_lock to read it anyway, so no added risk there.
I'm not very savvy on users of the loadavg values, so I'm not as confident that this won't break anything. In fact, without changes to the CALC_LOAD() macros so it uses an intermediate value, I expect some very incorrect values could be seen.
However, assuming that's fixed, and folks don't object to reading valid but inconsistent load avg values (ie: the 5 minute load not including high load seen in the 1minute load) in the two functions above, then this might work.
thanks
-john
PATCH 1/1 Move calc_load call out from xtime_lock protection
Quoted 10 lines · john stultz
Quoted 3 lines · Dimitri Sivanich
Why does the
xtime_lockneed to be held whencalc_load()is called? Since the calculation is statistical in nature, it doesn't -seem- to warrant protection via a write lock.I'm not very savvy on users of the loadavg values, so I'm not as confident that this won't break anything. In fact, without changes to the
CALC_LOAD()macros so it uses an intermediate value, I expect some very incorrect values could be seen.
Quoted 4 lines
However, assuming that's fixed, and folks don't object to reading valid but inconsistent load avg values (ie: the 5 minute load not including high load seen in the 1minute load) in the two functions above, then this might work.
John,
Instead of modifying the CALC_LOAD macros to avoid writing intermediate results, how about going one step further and writing out the final results at the end of the loop?
Also, maybe adding an avenrun_lock for writers might be a good thing as well, in case anyone does call this from multiple cpus.
I've added both changes to the patch.
Again, there is no read lock however. We could have the readers (that currently take the xtime_lock) take the avenrun_lock, but I'm not sure that's needed and have not included that in the following patch.
---
This applies to the -tip tree master branch.
Tested on ia64 only.
arch/alpha/kernel/time.c | 1 + arch/arm/kernel/time.c | 1 + arch/arm/mach-clps711x/include/mach/time.h | 2 ++ arch/arm/mach-l7200/include/mach/time.h | 2 ++ arch/blackfin/kernel/time.c | 2 ++ arch/cris/arch-v10/kernel/time.c | 2 ++ arch/cris/arch-v32/kernel/time.c | 1 + arch/frv/kernel/time.c | 1 + arch/h8300/kernel/time.c | 1 + arch/ia64/kernel/time.c | 1 + arch/ia64/xen/time.c | 2 ++ arch/m32r/kernel/time.c | 1 + arch/m68k/kernel/time.c | 1 + arch/m68k/sun3/sun3ints.c | 1 + arch/m68knommu/kernel/time.c | 2 ++ arch/mn10300/kernel/time.c | 1 + arch/parisc/kernel/time.c | 1 + arch/sh/kernel/time_32.c | 1 + arch/sh/kernel/time_64.c | 1 + arch/sparc/kernel/pcic.c | 2 ++ arch/sparc/kernel/time_32.c | 1 + arch/xtensa/kernel/time.c | 2 ++ include/linux/timer.h | 5 +++++ kernel/time/tick-common.c | 1 + kernel/time/tick-sched.c | 2 ++ kernel/timer.c | 22 +++++++++++++++------- 26 files changed, 53 insertions(+), 7 deletions(-)
arch/ia64/kernel/time.c +1 -0
@@ -201,6 +201,7 @@ timer_interrupt (int irq, void *dev_id)do_timer (1 ); local_cpu_data->itm_next = new_itm;write_sequnlock (&xtime_lock); +calc_load (1 ); }else local_cpu_data->itm_next = new_itm;
kernel/timer.c +15 -7
@@ -1137,30 +1137,39 @@ static unsigned long count_active_tasks(* Nothing else seems to be standardized: the fractional size etc * all seem to differ on different machines. * -* Requires xtime_lock to access. +* Requires avenrun_lock to write. Readers are not protected. */ unsigned long avenrun[3 ]; +static DEFINE_SPINLOCK (avenrun_lock);EXPORT_SYMBOL (avenrun);/* * calc_load - given tick count, update the avenrun load estimates. -* This is called while holding a write_lock on xtime_lock. */ -static inline void calc_load (unsigned long ticks) +void calc_load (unsigned long ticks) {unsigned long active_tasks;/* fixed-point */ static int count =LOAD_FREQ ; count -= ticks;if (unlikely (count <0 )) { +unsigned long avr_1, avr_5, avr_15; active_tasks =count_active_tasks (); +spin_lock (&avenrun_lock); + avr_1 = avenrun[0 ]; + avr_5 = avenrun[1 ]; + avr_15 = avenrun[2 ];do { -CALC_LOAD (avenrun[0 ],EXP_1 , active_tasks); -CALC_LOAD (avenrun[1 ],EXP_5 , active_tasks); -CALC_LOAD (avenrun[2 ],EXP_15 , active_tasks); +CALC_LOAD (avr_1,EXP_1 , active_tasks); +CALC_LOAD (avr_5,EXP_5 , active_tasks); +CALC_LOAD (avr_15,EXP_15 , active_tasks); count +=LOAD_FREQ ; }while (count <0 ); + avenrun[0 ] = avr_1; + avenrun[1 ] = avr_5; + avenrun[2 ] = avr_15; +spin_unlock (&avenrun_lock); } }
@@ -1196,7 +1205,6 @@ void run_local_timers(void)static inline void update_times (unsigned long ticks) {update_wall_time (); -calc_load (ticks); }/*
include/linux/timer.h +5 -0
@@ -183,6 +183,11 @@ extern unsigned long next_timer_interrupextern unsigned long get_next_timer_interrupt (unsigned long now);/* +* Calculate load averages. +*/ +extern void calc_load (unsigned long ); + +/* * Timer-statistics info: */ #ifdef CONFIG_TIMER_STATS
kernel/time/tick-common.c +1 -0
@@ -67,6 +67,7 @@ static void tick_periodic(int cpu)do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 ); }update_process_times (user_mode (get_irq_regs ()));
kernel/time/tick-sched.c +2 -0
@@ -81,6 +81,8 @@ static void tick_do_update_jiffies64(kti tick_next_period =ktime_add (last_jiffies_update, tick_period); }write_sequnlock (&xtime_lock); +if (ticks) +calc_load (ticks); }/*
arch/ia64/xen/time.c +2 -0
@@ -23,6 +23,7 @@#include <linux/delay.h> #include <linux/kernel_stat.h> #include <linux/posix-timers.h> +#include <linux/timer.h> #include <linux/irq.h> #include <linux/clocksource.h>
@@ -145,6 +146,7 @@ consider_steal_time(unsigned long new_itdo_timer (stolen + blocked); local_cpu_data->itm_next = delta_itm + new_itm;write_sequnlock (&xtime_lock); +calc_load (stolen + blocked); }else { local_cpu_data->itm_next = delta_itm + new_itm; }
arch/alpha/kernel/time.c +1 -0
@@ -137,6 +137,7 @@ irqreturn_t timer_interrupt(int irq, voi }write_sequnlock (&xtime_lock); +calc_load (nticks);#ifndef CONFIG_SMP while (nticks--)
arch/arm/kernel/time.c +1 -0
@@ -339,6 +339,7 @@ void timer_tick(void)write_seqlock (&xtime_lock);do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/blackfin/kernel/time.c +2 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/profile.h> #include <linux/interrupt.h> +#include <linux/timer.h> #include <linux/time.h> #include <linux/irq.h> #include <linux/delay.h>
@@ -164,6 +165,7 @@ irqreturn_t timer_interrupt(int irq, voi }#endif write_sequnlock (&xtime_lock); +calc_load (1 );#ifdef CONFIG_IPIPE update_root_process_times (get_irq_regs ());
arch/frv/kernel/time.c +1 -0
@@ -97,6 +97,7 @@ static irqreturn_t timer_interrupt(int i#endif /* CONFIG_HEARTBEAT */ write_sequnlock (&xtime_lock); +calc_load (1 );update_process_times (user_mode (get_irq_regs ()));
arch/h8300/kernel/time.c +1 -0
@@ -38,6 +38,7 @@ void h8300_timer_tick(void)write_seqlock (&xtime_lock);do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );update_process_times (user_mode (get_irq_regs ())); }
arch/m32r/kernel/time.c +1 -0
@@ -193,6 +193,7 @@ static irqreturn_t timer_interrupt(int iprofile_tick (CPU_PROFILING );#endif do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/m68k/kernel/time.c +1 -0
@@ -41,6 +41,7 @@ static inline int set_rtc_mmss(unsignedstatic irqreturn_t timer_interrupt (int irq,void *dummy) {do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/m68k/sun3/sun3ints.c +1 -0
@@ -67,6 +67,7 @@ static irqreturn_t sun3_int5(int irq, vointersil_clear ();#endif do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/m68knommu/kernel/time.c +2 -0
@@ -50,6 +50,8 @@ irqreturn_t arch_timer_interrupt(int irqwrite_sequnlock (&xtime_lock); +calc_load (1 ); +#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/mn10300/kernel/time.c +1 -0
@@ -111,6 +111,7 @@ static irqreturn_t timer_interrupt(int i/* advance the kernel's time tracking system */ profile_tick (CPU_PROFILING );do_timer (1 ); +calc_load (1 );check_rtc_time (); }
arch/parisc/kernel/time.c +1 -0
@@ -147,6 +147,7 @@ irqreturn_t timer_interrupt(int irq, voiwrite_seqlock (&xtime_lock);do_timer (ticks_elapsed);write_sequnlock (&xtime_lock); +calc_load (ticks_elapsed); }return IRQ_HANDLED ;
arch/sh/kernel/time_32.c +1 -0
@@ -142,6 +142,7 @@ void handle_timer_tick(void) last_rtc_update = xtime.tv_sec -600 ; }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/sh/kernel/time_64.c +1 -0
@@ -256,6 +256,7 @@ static inline void do_timer_interrupt(vo last_rtc_update = xtime.tv_sec -600 ; }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/sparc/kernel/pcic.c +2 -0
@@ -12,6 +12,7 @@#include <linux/kernel.h> #include <linux/types.h> +#include <linux/timer.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/slab.h>
@@ -707,6 +708,7 @@ static irqreturn_t pcic_timer_handler (ipcic_clear_clock_irq ();do_timer (1 );write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));#endif
arch/sparc/kernel/time_32.c +1 -0
@@ -110,6 +110,7 @@ static irqreturn_t timer_interrupt(int d last_rtc_update = xtime.tv_sec -600 ;/* do it again in 60 s */ }write_sequnlock (&xtime_lock); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (get_irq_regs ()));
arch/xtensa/kernel/time.c +2 -0
@@ -13,6 +13,7 @@*/ #include <linux/errno.h> +#include <linux/timer.h> #include <linux/time.h> #include <linux/timex.h> #include <linux/interrupt.h>
@@ -189,6 +190,7 @@ again: last_rtc_update +=60 ; }write_sequnlock (&xtime_lock); +calc_load (1 ); }/* Allow platform to do something useful (Wdog). */
arch/arm/mach-clps711x/include/mach/time.h +2 -0
@@ -17,6 +17,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/timer.h> #include <asm/leds.h> #include <asm/hardware/clps7111.h>
@@ -31,6 +32,7 @@ p720t_timer_interrupt(int irq, void *devstruct pt_regs *regs =get_irq_regs ();do_leds ();do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (regs));#endif
arch/arm/mach-l7200/include/mach/time.h +2 -0
@@ -11,6 +11,7 @@#ifndef _ASM_ARCH_TIME_H#define _ASM_ARCH_TIME_H +#include <linux/timer.h> #include <mach/irqs.h> /*
@@ -47,6 +48,7 @@ timer_interrupt(int irq, void *dev_id) {struct pt_regs *regs =get_irq_regs ();do_timer (1 ); +calc_load (1 );#ifndef CONFIG_SMP update_process_times (user_mode (regs));#endif
arch/cris/arch-v10/kernel/time.c +2 -0
@@ -231,6 +231,8 @@ timer_interrupt(int irq, void *dev_id)/* call the real timer interrupt handler */ do_timer (1 ); + +calc_load (1 );cris_do_profile (regs);/* Save profiling information */
arch/cris/arch-v32/kernel/time.c +1 -0
@@ -240,6 +240,7 @@ timer_interrupt(int irq, void *dev_id)/* Call the real timer interrupt handler */ do_timer (1 ); +calc_load (1 );/* * If we have an externally synchronized Linux clock, then update * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be