diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 08:48:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 08:48:25 -0800 |
| commit | e56425b135a8892d1e71ad5bb605d12c10efeb32 (patch) | |
| tree | 9bb899e1b6b45a125bcc21554f3673878d932035 /kernel/posix-timers.c | |
| parent | 786f8ba2e9449a7f01ec6bc35838d0a335921061 (diff) | |
| parent | 6622e670b26fbaa9c4ae7772a4d2d0abd3414b51 (diff) | |
| download | linux-stable-e56425b135a8892d1e71ad5bb605d12c10efeb32.tar.gz linux-stable-e56425b135a8892d1e71ad5bb605d12c10efeb32.tar.bz2 linux-stable-e56425b135a8892d1e71ad5bb605d12c10efeb32.zip | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
posix-timers.c: Don't export local functions
clocksource: start CMT at clocksource resume
clocksource: add suspend callback
clocksource: add argument to resume callback
ntp: Cleanup xtime references in ntp.c
ntp: Make time_esterror and time_maxerror static
Diffstat (limited to 'kernel/posix-timers.c')
| -rw-r--r-- | kernel/posix-timers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 495440779ce3..00d1fda58ab6 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -256,7 +256,7 @@ static int posix_get_monotonic_coarse(clockid_t which_clock, return 0; } -int posix_get_coarse_res(const clockid_t which_clock, struct timespec *tp) +static int posix_get_coarse_res(const clockid_t which_clock, struct timespec *tp) { *tp = ktime_to_timespec(KTIME_LOW_RES); return 0; |