git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm26
/
kernel
/
time.c
diff --git
a/arch/arm26/kernel/time.c
b/arch/arm26/kernel/time.c
index
549a6b2
..
3355253
100644
(file)
--- a/
arch/arm26/kernel/time.c
+++ b/
arch/arm26/kernel/time.c
@@
-34,10
+34,6
@@
#include <asm/irq.h>
#include <asm/ioc.h>
#include <asm/irq.h>
#include <asm/ioc.h>
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
extern unsigned long wall_jiffies;
/* this needs a better home */
extern unsigned long wall_jiffies;
/* this needs a better home */
@@
-114,7
+110,7
@@
static unsigned long next_rtc_update;
*/
static inline void do_set_rtc(void)
{
*/
static inline void do_set_rtc(void)
{
- if (
time_status & STA_UNSYNC
|| set_rtc == NULL)
+ if (
!ntp_synced()
|| set_rtc == NULL)
return;
//FIXME - timespec.tv_sec is a time_t not unsigned long
return;
//FIXME - timespec.tv_sec is a time_t not unsigned long
@@
-189,10
+185,7
@@
int do_settimeofday(struct timespec *tv)
xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_nsec;
xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_nsec;
- time_adjust = 0; /* stop active adjtime() */
- time_status |= STA_UNSYNC;
- time_maxerror = NTP_PHASE_LIMIT;
- time_esterror = NTP_PHASE_LIMIT;
+ ntp_clear();
write_sequnlock_irq(&xtime_lock);
clock_was_set();
return 0;
write_sequnlock_irq(&xtime_lock);
clock_was_set();
return 0;