diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 10:34:18 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 10:34:29 +0200 |
| commit | f71bb0ac5e85410601b0db29d7b1635345ea61a4 (patch) | |
| tree | 7c3ef70ef008db87d8b71e5de0632766ecd64d2f /arch/powerpc/kernel | |
| parent | 7285dd7fd375763bfb8ab1ac9cf3f1206f503c16 (diff) | |
| parent | a42548a18866e87092db93b771e6c5b060d78401 (diff) | |
| download | blackbird-op-linux-f71bb0ac5e85410601b0db29d7b1635345ea61a4.tar.gz blackbird-op-linux-f71bb0ac5e85410601b0db29d7b1635345ea61a4.zip | |
Merge branch 'timers/posixtimers' into timers/tracing
Merge reason: timer tracepoint patches depend on both branches
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index a508388fb87c..5b1657540a7d 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -193,6 +193,8 @@ EXPORT_SYMBOL(__cputime_clockt_factor); DEFINE_PER_CPU(unsigned long, cputime_last_delta); DEFINE_PER_CPU(unsigned long, cputime_scaled_last_delta); +cputime_t cputime_one_jiffy; + static void calc_cputime_factors(void) { struct div_result res; @@ -500,6 +502,7 @@ static int __init iSeries_tb_recal(void) tb_to_xs = divres.result_low; vdso_data->tb_ticks_per_sec = tb_ticks_per_sec; vdso_data->tb_to_xs = tb_to_xs; + setup_cputime_one_jiffy(); } else { printk( "Titan recalibrate: FAILED (difference > 4 percent)\n" @@ -950,6 +953,7 @@ void __init time_init(void) tb_ticks_per_usec = ppc_tb_freq / 1000000; tb_to_us = mulhwu_scale_factor(ppc_tb_freq, 1000000); calc_cputime_factors(); + setup_cputime_one_jiffy(); /* * Calculate the length of each tick in ns. It will not be |
