Revert "clockevents: Use u32 for mult and shift factors"

This reverts commit b7ad2a012ab29b9c7ebf9679b0b69a41165abc48.

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 4d438b0bc10a5c6849e7d56a8e102442ef67f27d..b7905462043cf3a7d8da526db4aa8f8f533492e9 100644 (file)
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -79,8 +79,8 @@ struct clock_event_device {
        unsigned int            features;
        unsigned long           max_delta_ns;
        unsigned long           min_delta_ns;
-       u32                     mult;
-       u32                     shift;
+       unsigned long           mult;
+       int                     shift;
        int                     rating;
        int                     irq;
        const struct cpumask    *cpumask;

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index a6e445c673b05644c201bac049c65de10d8a9cc1..54c0ddaa06c98d3b4b244657c54145183c90e28d 100644 (file)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -209,8 +209,8 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
        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:           %u\n", dev->mult);
-       SEQ_printf(m, " shift:          %u\n", dev->shift);
+       SEQ_printf(m, " mult:           %lu\n", dev->mult);
+       SEQ_printf(m, " shift:          %d\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));