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

Commit b82b6813 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 

Pull nios2 update from Ley Foon Tan:
 "Use read_persistent_clock64() instead of read_persistent_clock()"

* tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Use read_persistent_clock64() instead of read_persistent_clock()
parents 8837c70d 3d9644ef

arch/nios2/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ static int __init nios2_time_init(struct device_node *timer) 
	return ret;

}



void read_persistent_clock(struct timespec *ts)

void read_persistent_clock64(struct timespec64 *ts)

{

	ts->tv_sec = mktime(2007, 1, 1, 0, 0, 0);

	ts->tv_sec = mktime64(2007, 1, 1, 0, 0, 0);

	ts->tv_nsec = 0;

}