diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:45:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:45:08 -0700 |
| commit | 78c4def67e8eebe602655a3dec9aa08f0e2f7c4b (patch) | |
| tree | 8c0c756bbff7325f5c2a773f8cc64d8390ebe5b5 /include/linux/time.h | |
| parent | 7e6628e4bcb3b3546c625ec63ca724f28ab14f0c (diff) | |
| parent | 942c3c5c329274fa6de5998cb911cf3d0a42d0b1 (diff) | |
| download | linux-78c4def67e8eebe602655a3dec9aa08f0e2f7c4b.tar.gz linux-78c4def67e8eebe602655a3dec9aa08f0e2f7c4b.tar.bz2 linux-78c4def67e8eebe602655a3dec9aa08f0e2f7c4b.zip | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Make lookup table const
RTC: Disable CONFIG_RTC_CLASS from being built as a module
timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS=n
timers: Remove delayed irqwork from alarmtimers implementation
timers: Improve alarmtimer comments and minor fixes
timers: Posix interface for alarm-timers
timers: Introduce in-kernel alarm-timer interface
timers: Add rb_init_node() to allow for stack allocated rb nodes
time: Add timekeeping_inject_sleeptime
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 454a26205787..b3061782dec3 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -126,6 +126,7 @@ struct timespec __current_kernel_time(void); /* does not take xtime_lock */ struct timespec get_monotonic_coarse(void); void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim, struct timespec *wtom, struct timespec *sleep); +void timekeeping_inject_sleeptime(struct timespec *delta); #define CURRENT_TIME (current_kernel_time()) #define CURRENT_TIME_SEC ((struct timespec) { get_seconds(), 0 }) @@ -294,6 +295,8 @@ struct itimerval { #define CLOCK_REALTIME_COARSE 5 #define CLOCK_MONOTONIC_COARSE 6 #define CLOCK_BOOTTIME 7 +#define CLOCK_REALTIME_ALARM 8 +#define CLOCK_BOOTTIME_ALARM 9 /* * The IDs of various hardware clocks: |