tick/xen: Provide and use tick_suspend_local() and tick_resume_local()

[cascardo/linux.git] / kernel / time / timer_list.c

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 2cfd194..e878c2e 100644 (file)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -16,10 +16,10 @@
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/kallsyms.h>
-#include <linux/tick.h>
 
 #include <asm/uaccess.h>
 
+#include "tick-internal.h"
 
 struct timer_list_iter {
        int cpu;
@@ -233,27 +233,27 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
                print_name_offset(m, dev->set_mode);
                SEQ_printf(m, "\n");
        } else {
-               if (dev->set_mode_shutdown) {
+               if (dev->set_state_shutdown) {
                        SEQ_printf(m, " shutdown: ");
-                       print_name_offset(m, dev->set_mode_shutdown);
+                       print_name_offset(m, dev->set_state_shutdown);
                        SEQ_printf(m, "\n");
                }
 
-               if (dev->set_mode_periodic) {
+               if (dev->set_state_periodic) {
                        SEQ_printf(m, " periodic: ");
-                       print_name_offset(m, dev->set_mode_periodic);
+                       print_name_offset(m, dev->set_state_periodic);
                        SEQ_printf(m, "\n");
                }
 
-               if (dev->set_mode_oneshot) {
+               if (dev->set_state_oneshot) {
                        SEQ_printf(m, " oneshot:  ");
-                       print_name_offset(m, dev->set_mode_oneshot);
+                       print_name_offset(m, dev->set_state_oneshot);
                        SEQ_printf(m, "\n");
                }
 
-               if (dev->set_mode_resume) {
+               if (dev->tick_resume) {
                        SEQ_printf(m, " resume:   ");
-                       print_name_offset(m, dev->set_mode_resume);
+                       print_name_offset(m, dev->tick_resume);
                        SEQ_printf(m, "\n");
                }
        }