diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/linux/timer.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index c982304dbafd..eeef6643d4c6 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -98,4 +98,10 @@ extern void run_local_timers(void); | |||
| 98 | struct hrtimer; | 98 | struct hrtimer; |
| 99 | extern int it_real_fn(struct hrtimer *); | 99 | extern int it_real_fn(struct hrtimer *); |
| 100 | 100 | ||
| 101 | unsigned long __round_jiffies(unsigned long j, int cpu); | ||
| 102 | unsigned long __round_jiffies_relative(unsigned long j, int cpu); | ||
| 103 | unsigned long round_jiffies(unsigned long j); | ||
| 104 | unsigned long round_jiffies_relative(unsigned long j); | ||
| 105 | |||
| 106 | |||
| 101 | #endif | 107 | #endif |