aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-22 13:29:09 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-25 18:38:12 +0100
commitc7986acba211e8285e14c9603fb89e6f4ea0b9f8 (patch)
treefb90edb83df6a2cc0e7ac33896c731016f7f6a5a /kernel
parent478b7aab1682246a3d1e76e27a0aecb2f0013379 (diff)
time: ntp: micro-optimize ntp_update_offset()
Impact: cleanup, no functionality changed The time_reftime update in ntp_update_offset() to xtime.tv_sec is a convoluted way of saying that we want to freeze the frequency and want the 'secs' delta to be 0. Also make this branch unlikely. This shaves off 8 bytes from the code size: text data bss dec hex filename 2504 114 136 2754 ac2 ntp.o.before 2496 114 136 2746 aba ntp.o.after Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/ntp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 5202dde2f0a..580a3502869 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -141,10 +141,10 @@ static void ntp_update_offset(long offset)
* Select how the frequency is to be controlled
* and in which mode (PLL or FLL).
*/
- if (time_status & STA_FREQHOLD || time_reftime == 0)
- time_reftime = xtime.tv_sec;
-
secs = xtime.tv_sec - time_reftime;
+ if (unlikely(time_status & STA_FREQHOLD || time_reftime == 0))
+ secs = 0;
+
time_reftime = xtime.tv_sec;
offset64 = offset;