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

Commit d1c0b8f8 authored by Matt Helsley's avatar Matt Helsley Committed by Linus Torvalds
Browse files

[PATCH] Remove getnstimestamp() 



Remove getnstimestamp() in favor of ktime.h's ktime_get_ts()

Signed-off-by: default avatarMatt Helsley <matthltc@us.ibm.com>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent caf3c9dc

include/linux/time.h

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ extern int do_setitimer(int which, struct itimerval *value, 
			struct itimerval *ovalue);

extern int do_getitimer(int which, struct itimerval *value);

extern void getnstimeofday(struct timespec *tv);

extern void getnstimestamp(struct timespec *ts);



extern struct timespec timespec_trunc(struct timespec t, unsigned gran);

kernel/time.c

+0 −22
Original line number Diff line number Diff line
@@ -564,28 +564,6 @@ void getnstimeofday(struct timespec *tv) 
EXPORT_SYMBOL_GPL(getnstimeofday);

#endif



void getnstimestamp(struct timespec *ts)

{

	unsigned int seq;

	struct timespec wall2mono;



	/* synchronize with settimeofday() changes */

	do {

		seq = read_seqbegin(&xtime_lock);

		getnstimeofday(ts);

		wall2mono = wall_to_monotonic;

	} while(unlikely(read_seqretry(&xtime_lock, seq)));



	/* adjust to monotonicaly-increasing values */

	ts->tv_sec += wall2mono.tv_sec;

	ts->tv_nsec += wall2mono.tv_nsec;

	while (unlikely(ts->tv_nsec >= NSEC_PER_SEC)) {

		ts->tv_nsec -= NSEC_PER_SEC;

		ts->tv_sec++;

	}

}

EXPORT_SYMBOL_GPL(getnstimestamp);



/* Converts Gregorian date to seconds since 1970-01-01 00:00:00.

 * Assumes input in normal date format, i.e. 1980-12-31 23:59:59

 * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.