diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 17:43:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 17:43:39 +0300 |
| commit | eb42c75878e4d13941dcbcf2ef1027c257b099a6 (patch) | |
| tree | f0fa257a00b4cac528b79724f59b076f30b1dd3d /include/linux/timer.h | |
| parent | 9868ee63b896ee4d2ceb8c292e88d7f4e66caaf9 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.tar.xz | |
Merge branch 'linus' into x86/crashdump
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index d4ba79248a27..daf9685b861c 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -186,4 +186,9 @@ unsigned long __round_jiffies_relative(unsigned long j, int cpu); unsigned long round_jiffies(unsigned long j); unsigned long round_jiffies_relative(unsigned long j); +unsigned long __round_jiffies_up(unsigned long j, int cpu); +unsigned long __round_jiffies_up_relative(unsigned long j, int cpu); +unsigned long round_jiffies_up(unsigned long j); +unsigned long round_jiffies_up_relative(unsigned long j); + #endif |