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 /arch/ia64/kernel | |
| parent | 786f8ba2e9449a7f01ec6bc35838d0a335921061 (diff) | |
| parent | 6622e670b26fbaa9c4ae7772a4d2d0abd3414b51 (diff) | |
| download | kernel_samsung_crespo-e56425b135a8892d1e71ad5bb605d12c10efeb32.zip kernel_samsung_crespo-e56425b135a8892d1e71ad5bb605d12c10efeb32.tar.gz kernel_samsung_crespo-e56425b135a8892d1e71ad5bb605d12c10efeb32.tar.bz2 | |
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 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index a35c661..47a1927 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -61,7 +61,7 @@ unsigned long long sched_clock(void) #ifdef CONFIG_PARAVIRT static void -paravirt_clocksource_resume(void) +paravirt_clocksource_resume(struct clocksource *cs) { if (pv_time_ops.clocksource_resume) pv_time_ops.clocksource_resume(); |