Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31089c13 authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

timekeeping: Introduce timekeeping_leap_insert 



Move the adjustment of xtime, wall_to_monotonic and the update of the
vsyscall variables to the timekeeping code.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
LKML-Reference: <20090814134807.609730216@de.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4cd1993f

include/linux/time.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran); 
extern int timekeeping_valid_for_hres(void);

extern void update_wall_time(void);

extern void update_xtime_cache(u64 nsec);

extern void timekeeping_leap_insert(int leapsecond);



struct tms;

extern void do_sys_times(struct tms *);

kernel/time/ntp.c

+2 −5
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) 
	case TIME_OK:

		break;

	case TIME_INS:

		xtime.tv_sec--;

		wall_to_monotonic.tv_sec++;

		timekeeping_leap_insert(-1);

		time_state = TIME_OOP;

		printk(KERN_NOTICE

			"Clock: inserting leap second 23:59:60 UTC\n");
@@ -203,9 +202,8 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) 
		res = HRTIMER_RESTART;

		break;

	case TIME_DEL:

		xtime.tv_sec++;

		timekeeping_leap_insert(1);

		time_tai--;

		wall_to_monotonic.tv_sec--;

		time_state = TIME_WAIT;

		printk(KERN_NOTICE

			"Clock: deleting leap second 23:59:59 UTC\n");
@@ -219,7 +217,6 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer) 
			time_state = TIME_OK;

		break;

	}

	update_vsyscall(&xtime, clock);



	write_sequnlock(&xtime_lock);

kernel/time/timekeeping.c

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ void update_xtime_cache(u64 nsec) 


struct clocksource *clock;



/* must hold xtime_lock */

void timekeeping_leap_insert(int leapsecond)

{

	xtime.tv_sec += leapsecond;

	wall_to_monotonic.tv_sec -= leapsecond;

	update_vsyscall(&xtime, clock);

}



#ifdef CONFIG_GENERIC_TIME

/**