diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 20:04:45 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 20:04:45 +0000 |
| commit | c613bbba6f39c8804f1f26e96fb68a117cc9e282 (patch) | |
| tree | 85fbc24f26b61ce4e7a908d18952e3abc1f5cd10 /kernel/sched_clock.c | |
| parent | cd4348339c21f4a15c01f3f120e92b3224a0a7da (diff) | |
| parent | 80eee6bca4069c48247005aa07cb5e8e86042aa3 (diff) | |
| download | kernel-crypto-c613bbba6f39c8804f1f26e96fb68a117cc9e282.tar.gz kernel-crypto-c613bbba6f39c8804f1f26e96fb68a117cc9e282.tar.xz kernel-crypto-c613bbba6f39c8804f1f26e96fb68a117cc9e282.zip | |
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'kernel/sched_clock.c')
| -rw-r--r-- | kernel/sched_clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 81787248b60..e8ab096ddfe 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c @@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) /* * scd->clock = clamp(scd->tick_gtod + delta, - * max(scd->tick_gtod, scd->clock), - * max(scd->clock, scd->tick_gtod + TICK_NSEC)); + * max(scd->tick_gtod, scd->clock), + * scd->tick_gtod + TICK_NSEC); */ clock = scd->tick_gtod + delta; min_clock = wrap_max(scd->tick_gtod, scd->clock); - max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC); + max_clock = scd->tick_gtod + TICK_NSEC; clock = wrap_max(clock, min_clock); clock = wrap_min(clock, max_clock); |