print_tickdevice(), assembling the per-tick device sections in
/proc/timer_list, is the last user of struct clock_event_device's
->min_delta_ns member.

In order to make this one fully obsolete while retaining userspace ABI,
calculate the displayed value of 'min_delta_ns' on the fly from
->min_delta_ticks_adjusted.

Signed-off-by: Nicolai Stange <nicsta...@gmail.com>
---
 kernel/time/timer_list.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index ba7d8b2..12a27cb 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -206,6 +206,9 @@ static void
 print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
 {
        struct clock_event_device *dev = td->evtdev;
+       u64 min_delta_ns;
+
+       min_delta_ns = clockevent_delta2ns(dev->min_delta_ticks_adjusted, dev);
 
        SEQ_printf(m, "Tick Device: mode:     %d\n", td->mode);
        if (cpu < 0)
@@ -222,7 +225,7 @@ print_tickdevice(struct seq_file *m, struct tick_device 
*td, int cpu)
        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);
+                  (unsigned long long) 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", clockevent_get_state(dev));
-- 
2.10.2

Reply via email to