kpatch/test/integration/centos-7/gcc-constprop.patch
Joe Lawrence 2f8170e962 testing: rebase patches for CentOS 7.4 kernel-3.10.0-693.el7
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
2017-09-22 17:02:33 -04:00

14 lines
423 B
Diff

diff -Nupr src.orig/kernel/time/timekeeping.c src/kernel/time/timekeeping.c
--- src.orig/kernel/time/timekeeping.c 2017-09-22 15:27:21.602055778 -0400
+++ src/kernel/time/timekeeping.c 2017-09-22 15:27:27.522080292 -0400
@@ -877,6 +877,9 @@ void do_gettimeofday(struct timeval *tv)
{
struct timespec64 now;
+ if (!tv)
+ return;
+
getnstimeofday64(&now);
tv->tv_sec = now.tv_sec;
tv->tv_usec = now.tv_nsec/1000;