hrtimer updates for 2.6.24
Linus,
please pull from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git
the following small updates.
Thanks,
tglx
---
Adrian Bunk (1):
clockevents: unexport tick_nohz_get_sleep_length
Michael Ellerman (1):
Quieten hrtimer printk: "Switched to high resolution mode .."
Vegard Nossum (1):
timer_list: Fix printk format strings
kernel/hrtimer.c | 2 +- kernel/time/tick-sched.c | 2 -- kernel/time/timer_list.c | 6 ++++-- 3 files changed, 5 insertions(+), 5 deletions(-)
kernel/hrtimer.c +1 -1
@@ -602,7 +602,7 @@ static int hrtimer_switch_to_hres(void)/* "Retrigger" the interrupt to get things going */ retrigger_next_event (NULL );local_irq_restore (flags); -printk (KERN_INFO "Switched to high resolution mode on CPU %d\n" , +printk (KERN_DEBUG "Switched to high resolution mode on CPU %d\n" ,smp_processor_id ());return 1 ; }
kernel/time/tick-sched.c +0 -2
@@ -320,8 +320,6 @@ ktime_t tick_nohz_get_sleep_length(void)return ts->sleep_length; } -EXPORT_SYMBOL_GPL (tick_nohz_get_sleep_length); -/** * nohz_restart_sched_tick - restart the idle tick from the idle task *
kernel/time/timer_list.c +4 -2
@@ -129,7 +129,8 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)struct hrtimer_cpu_base *cpu_base = &per_cpu (hrtimer_bases, cpu);int i; -SEQ_printf (m,"\ncpu: %d\n" , cpu); +SEQ_printf (m,"\n" ); +SEQ_printf (m,"cpu: %d\n" , cpu);for (i =0 ; i <HRTIMER_MAX_CLOCK_BASES ; i++) {SEQ_printf (m," clock %d:\n" , i);print_base (m, cpu_base->clock_base + i, now);
@@ -184,7 +185,8 @@ print_tickdevice(struct seq_file *m, struct tick_device *td) {struct clock_event_device *dev = td->evtdev; -SEQ_printf (m,"\nTick Device: mode: %d\n" , td->mode); +SEQ_printf (m,"\n" ); +SEQ_printf (m,"Tick Device: mode: %d\n" , td->mode);SEQ_printf (m,"Clock Event Device: " );if (!dev) {