Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / include / asm-s390 / timer.h

diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
index fcd6c256a2d194aa4b1269f89cfc25fabb8c96a6..d98d79e35cd6f6d6459110b6a0290e5fe59721d4 100644 (file)
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
@@ -26,7 +26,7 @@ struct vtimer_list {
        spinlock_t lock;
        unsigned long magic;
 
-       void (*function)(unsigned long, struct pt_regs*);
+       void (*function)(unsigned long);
        unsigned long data;
 };
 
@@ -45,6 +45,21 @@ extern void add_virt_timer_periodic(void *new);
 extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
 extern int del_virt_timer(struct vtimer_list *timer);
 
+extern void init_cpu_vtimer(void);
+extern void vtime_init(void);
+
+#ifdef CONFIG_VIRT_TIMER
+
+extern void vtime_start_cpu_timer(void);
+extern void vtime_stop_cpu_timer(void);
+
+#else
+
+static inline void vtime_start_cpu_timer(void) { }
+static inline void vtime_stop_cpu_timer(void) { }
+
+#endif /* CONFIG_VIRT_TIMER */
+
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_S390_TIMER_H */