diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:45:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:45:32 -0800 |
| commit | 02aedd69e2ef31b0fca1e8960cb1e7fd0c343110 (patch) | |
| tree | c096ab87e0832e8ddda45241b422c0064cfe0cbb /include/asm-s390/timer.h | |
| parent | 9ad0830f307bcd8dc285cfae58998d43b21727f4 (diff) | |
| parent | 4d284cac76d0bfebc42d76b428c4e44d921200a9 (diff) | |
| download | op-kernel-dev-02aedd69e2ef31b0fca1e8960cb1e7fd0c343110.zip op-kernel-dev-02aedd69e2ef31b0fca1e8960cb1e7fd0c343110.tar.gz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits)
[S390] Avoid excessive inlining.
[S390] Mark kernel text section read-only.
[S390] Convert memory detection into C code.
[S390] Calibrate delay and bogomips.
[S390] Hypervisor filesystem (s390_hypfs) for z/VM
[S390] Add crypto support for 3592 tape devices
[S390] boot from NSS support
[S390] Support for s390 Pseudo Random Number Generator
[S390] ETR support.
[S390] noexec protection
[S390] move crypto options and some cleanup.
[S390] cio: Don't spam debug feature.
[S390] Cleanup of CHSC event handling.
[S390] cio: declare hardware structures packed.
[S390] Add set_fs(USER_DS) to start_thread().
[S390] cio: Catch operand exceptions on stsch.
[S390] Fix register usage description.
[S390] kretprobe_trampoline_holder() in wrong section.
[S390] Fix kprobes breakpoint handling.
[S390] Update maintainers file.
...
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 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 */ |
