diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 23:59:01 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 23:59:01 +0400 |
| commit | f72222c74bd642182cc892c99df65cb105c61193 (patch) | |
| tree | 3e35484b289f6dec19a73d5e56dcbcba846af032 /include/linux/timer.h | |
| parent | 318b0b8d90326aee6a66c994432eee95c0a9aaea (diff) | |
| parent | d3c9e9a1390f8a34da8b69e09fa1afa90f5067f4 (diff) | |
| download | linux-f72222c74bd642182cc892c99df65cb105c61193.tar.xz | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 6cdb6f3331f1..ccf882eed8f8 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -163,7 +163,10 @@ extern void add_timer_on(struct timer_list *timer, int cpu); extern int del_timer(struct timer_list * timer); extern int mod_timer(struct timer_list *timer, unsigned long expires); extern int mod_timer_pending(struct timer_list *timer, unsigned long expires); +extern int mod_timer_pinned(struct timer_list *timer, unsigned long expires); +#define TIMER_NOT_PINNED 0 +#define TIMER_PINNED 1 /* * The jiffies value which is added to now, when there is no timer * in the timer wheel: |