summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/timer.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-02-07 00:30:38 +0000
committerSteve French <sfrench@us.ibm.com>2007-02-07 00:30:38 +0000
commit1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch)
treefa63b4c1bbd775252f71d05fef4de6a904eb4448 /include/asm-s390/timer.h
parent87f440e70e07dace7db130f2f9fcea3f132aad8f (diff)
parentdda2ac15d23b38e4335e858848aa8c9a6710304f (diff)
downloadop-kernel-dev-1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f.zip
op-kernel-dev-1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f.tar.gz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-s390/timer.h')
-rw-r--r--include/asm-s390/timer.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
index 30e5cbe..adb3486 100644
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
@@ -45,6 +45,9 @@ 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);
+
#endif /* __KERNEL__ */
#endif /* _ASM_S390_TIMER_H */
OpenPOWER on IntegriCloud