diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /include/asm-s390/timer.h | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| download | kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.tar.gz kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.tar.xz kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.zip | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'include/asm-s390/timer.h')
| -rw-r--r-- | include/asm-s390/timer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h index 30e5cbe570f..adb34860a54 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 */ |