iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fortglx/3.5/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Browse Source
This commit is contained in:
Thomas Gleixner 2012-05-22 10:30:39 +02:00
commit b80fe1015b
3 changed files with 4 additions and 9 deletions
include/linux
time.h
kernel/time
ntp.ctimekeeping.c

1
include/linux/time.h

@ -167,7 +167,6 @@ extern void get_monotonic_boottime(struct timespec *ts);
extern struct timespec timespec_trunc(struct timespec t, unsigned gran); extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
extern int timekeeping_valid_for_hres(void); extern int timekeeping_valid_for_hres(void);
extern u64 timekeeping_max_deferment(void); extern u64 timekeeping_max_deferment(void);
extern void timekeeping_leap_insert(int leapsecond);
extern int timekeeping_inject_offset(struct timespec *ts); extern int timekeeping_inject_offset(struct timespec *ts);
struct tms; struct tms;

8
kernel/time/ntp.c

@ -412,6 +412,7 @@ int second_overflow(unsigned long secs)
if (secs % 86400 == 0) { if (secs % 86400 == 0) {
leap = -1; leap = -1;
time_state = TIME_OOP; time_state = TIME_OOP;
time_tai++;
printk(KERN_NOTICE printk(KERN_NOTICE
"Clock: inserting leap second 23:59:60 UTC\n"); "Clock: inserting leap second 23:59:60 UTC\n");
} }
@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
} }
break; break;
case TIME_OOP: case TIME_OOP:
time_tai++;
time_state = TIME_WAIT; time_state = TIME_WAIT;
break; break;
@ -473,8 +473,6 @@ int second_overflow(unsigned long secs)
<< NTP_SCALE_SHIFT; << NTP_SCALE_SHIFT;
time_adjust = 0; time_adjust = 0;
out: out:
spin_unlock_irqrestore(&ntp_lock, flags); spin_unlock_irqrestore(&ntp_lock, flags);
@ -559,10 +557,10 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
/* only set allowed bits */ /* only set allowed bits */
time_status &= STA_RONLY; time_status &= STA_RONLY;
time_status |= txc->status & ~STA_RONLY; time_status |= txc->status & ~STA_RONLY;
} }
/* /*
* Called with the xtime lock held, so we can access and modify * Called with ntp_lock held, so we can access and modify
* all the global NTP state: * all the global NTP state:
*/ */
static inline void process_adjtimex_modes(struct timex *txc, struct timespec *ts) static inline void process_adjtimex_modes(struct timex *txc, struct timespec *ts)

4
kernel/time/timekeeping.c

@ -240,7 +240,6 @@ void getnstimeofday(struct timespec *ts)
timespec_add_ns(ts, nsecs); timespec_add_ns(ts, nsecs);
} }
EXPORT_SYMBOL(getnstimeofday); EXPORT_SYMBOL(getnstimeofday);
ktime_t ktime_get(void) ktime_t ktime_get(void)
@ -357,8 +356,8 @@ void do_gettimeofday(struct timeval *tv)
tv->tv_sec = now.tv_sec; tv->tv_sec = now.tv_sec;
tv->tv_usec = now.tv_nsec/1000; tv->tv_usec = now.tv_nsec/1000;
} }
EXPORT_SYMBOL(do_gettimeofday); EXPORT_SYMBOL(do_gettimeofday);
/** /**
* do_settimeofday - Sets the time of day * do_settimeofday - Sets the time of day
* @tv: pointer to the timespec variable containing the new time * @tv: pointer to the timespec variable containing the new time
@ -392,7 +391,6 @@ int do_settimeofday(const struct timespec *tv)
return 0; return 0;
} }
EXPORT_SYMBOL(do_settimeofday); EXPORT_SYMBOL(do_settimeofday);