diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 14:00:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 14:00:26 -0700 |
| commit | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (patch) | |
| tree | f5a3a169b6cfafa36f9c35cc86e782596c820915 /include | |
| parent | 7ad7153b051d9628ecd6a336b543ea6ef099bd2c (diff) | |
| parent | ae90dd5dbee461652b90d9f7d292ba47dc3dc4b8 (diff) | |
| download | talos-obmc-linux-ca78f6baca863afe2e6a244a0fe94b3a70211d46.tar.gz talos-obmc-linux-ca78f6baca863afe2e6a244a0fe94b3a70211d46.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
Move workqueue exports to where the functions are defined.
[CPUFREQ] Misc cleanups in ondemand.
[CPUFREQ] Make ondemand sampling per CPU and remove the mutex usage in sampling path.
[CPUFREQ] Add queue_delayed_work_on() interface for workqueues.
[CPUFREQ] Remove slowdown from ondemand sampling path.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/cputime.h | 2 | ||||
| -rw-r--r-- | include/linux/workqueue.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/cputime.h b/include/asm-generic/cputime.h index 6f178563e336..09204e40d663 100644 --- a/include/asm-generic/cputime.h +++ b/include/asm-generic/cputime.h @@ -24,7 +24,9 @@ typedef u64 cputime64_t; #define cputime64_zero (0ULL) #define cputime64_add(__a, __b) ((__a) + (__b)) +#define cputime64_sub(__a, __b) ((__a) - (__b)) #define cputime64_to_jiffies64(__ct) (__ct) +#define jiffies64_to_cputime64(__jif) (__jif) #define cputime_to_cputime64(__ct) ((u64) __ct) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 957c21c16d62..9bca3539a1e5 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -63,6 +63,8 @@ extern void destroy_workqueue(struct workqueue_struct *wq); extern int FASTCALL(queue_work(struct workqueue_struct *wq, struct work_struct *work)); extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct work_struct *work, unsigned long delay)); +extern int queue_delayed_work_on(int cpu, struct workqueue_struct *wq, + struct work_struct *work, unsigned long delay); extern void FASTCALL(flush_workqueue(struct workqueue_struct *wq)); extern int FASTCALL(schedule_work(struct work_struct *work)); |
