Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ntp: use unsigned input for do_div()

Browse source 
The kernel NTP code shouldn't hand 64-bit *signed* values to do_div().  Make it
instead hand 64-bit unsigned values.  This gets rid of a couple of warnings.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
David Howells 2008-02-25 18:31:57 +01:00 committed by Thomas Gleixner
parent 84c6f6046c
commit e48af19f56
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/time/ntp.c
View file

@ -342,14 +342,16 @@ int do_adjtimex(struct timex *txc)
freq_adj = shift_right(freq_adj, time_constant * 2 + freq_adj = shift_right(freq_adj, time_constant * 2 +
(SHIFT_PLL + 2) * 2 - SHIFT_NSEC); (SHIFT_PLL + 2) * 2 - SHIFT_NSEC);
if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) { if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
u64 utemp64;
temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL); temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL);
if (time_offset < 0) { if (time_offset < 0) {
temp64 = -temp64; utemp64 = -temp64;
do_div(temp64, mtemp); do_div(utemp64, mtemp);
freq_adj -= temp64; freq_adj -= utemp64;
} else { } else {
do_div(temp64, mtemp); utemp64 = temp64;
freq_adj += temp64; do_div(utemp64, mtemp);
freq_adj += utemp64;
} }
} }
freq_adj += time_freq; freq_adj += time_freq;