Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[safe/jmp/linux-2.6] / kernel / time / timer_list.c

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index fddd69d..9d80db4 100644 (file)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -150,6 +150,9 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
        P_ns(expires_next);
        P(hres_active);
        P(nr_events);
+       P(nr_retries);
+       P(nr_hangs);
+       P_ns(max_hang_time);
 #endif
 #undef P
 #undef P_ns
@@ -204,10 +207,12 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
                return;
        }
        SEQ_printf(m, "%s\n", dev->name);
-       SEQ_printf(m, " max_delta_ns:   %lu\n", dev->max_delta_ns);
-       SEQ_printf(m, " min_delta_ns:   %lu\n", dev->min_delta_ns);
-       SEQ_printf(m, " mult:           %lu\n", dev->mult);
-       SEQ_printf(m, " shift:          %d\n", dev->shift);
+       SEQ_printf(m, " max_delta_ns:   %llu\n",
+                  (unsigned long long) dev->max_delta_ns);
+       SEQ_printf(m, " min_delta_ns:   %llu\n",
+                  (unsigned long long) dev->min_delta_ns);
+       SEQ_printf(m, " mult:           %u\n", dev->mult);
+       SEQ_printf(m, " shift:          %u\n", dev->shift);
        SEQ_printf(m, " mode:           %d\n", dev->mode);
        SEQ_printf(m, " next_event:     %Ld nsecs\n",
                   (unsigned long long) ktime_to_ns(dev->next_event));
@@ -252,7 +257,7 @@ static int timer_list_show(struct seq_file *m, void *v)
        u64 now = ktime_to_ns(ktime_get());
        int cpu;
 
-       SEQ_printf(m, "Timer List Version: v0.4\n");
+       SEQ_printf(m, "Timer List Version: v0.5\n");
        SEQ_printf(m, "HRTIMER_MAX_CLOCK_BASES: %d\n", HRTIMER_MAX_CLOCK_BASES);
        SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);
 
@@ -275,7 +280,7 @@ static int timer_list_open(struct inode *inode, struct file *filp)
        return single_open(filp, timer_list_show, NULL);
 }
 
-static struct file_operations timer_list_fops = {
+static const struct file_operations timer_list_fops = {
        .open           = timer_list_open,
        .read           = seq_read,
        .llseek         = seq_lseek,