diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 07:47:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 07:47:05 -0700 |
| commit | 93400708dba888d45b4da01e1753a3a743f44496 (patch) | |
| tree | 2bad883807ec1f49b63d486299b99040e75f6684 /kernel/time/timer_list.c | |
| parent | db3a91fe2b425c9adde47069efebdba44e665cef (diff) | |
| parent | edfed66e17854c312e81a2218f9b0592a555c9a3 (diff) | |
| download | kernel-crypto-93400708dba888d45b4da01e1753a3a743f44496.tar.gz kernel-crypto-93400708dba888d45b4da01e1753a3a743f44496.tar.xz kernel-crypto-93400708dba888d45b4da01e1753a3a743f44496.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
Quieten hrtimer printk: "Switched to high resolution mode .."
timer_list: Fix printk format strings
clockevents: unexport tick_nohz_get_sleep_length
Diffstat (limited to 'kernel/time/timer_list.c')
| -rw-r--r-- | kernel/time/timer_list.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index fdb2e03d4fe..12c5f4cb6b8 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c @@ -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) { |