Sophie

Sophie

distrib > Mageia > 7 > i586 > by-pkgid > 7ae1326686fcee9e8495e4e7a232d717 > files > 5

openafs-1.8.3-1.mga7.src.rpm

From b02434f5c6cab1f317c9fb6652e31a20195c20d8 Mon Sep 17 00:00:00 2001
From: Mark Vitale <mvitale@sinenomine.net>
Date: Fri, 18 Jan 2019 17:05:49 -0500
Subject: [PATCH] LINUX: correct include for ktime_get_coarse_real_ts64()

The include for the ktime_get_coarse_real_ts64() autoconf test is
incorrect; ktime_get_coarse_real_ts64() has always been in linux/ktime.h
(via #include timekeeping.h), not linux/time.h.

This autoconf test still ran correctly because the OpenAFS build was
inadvertently picking up ktime.h via the default autoconf include path.
Therefore, this commit is needed only to provide documentation and
clarity to future maintainers.

Introduced as a cut-n-paste error (from the current_kernel_time test)
with commit 3c454b39d04f4886536267c211171dae30dc0344 for Linux 4.20.

Reviewed-on: https://gerrit.openafs.org/13437
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 10b02075a262dbe802266ea4bcac3936dff5dd23)

Change-Id: Ide1adcc8536ed8829361e0961da96949099d5caf
Reviewed-on: https://gerrit.openafs.org/13523
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---
 src/cf/linux-kernel-func.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4
index 40fcb16..34c5fa4 100644
--- a/src/cf/linux-kernel-func.m4
+++ b/src/cf/linux-kernel-func.m4
@@ -73,7 +73,7 @@ AC_CHECK_LINUX_FUNC([kernel_setsockopt],
                     [#include <linux/net.h>],
                     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
 AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64],
-                    [#include <linux/time.h>],
+                    [#include <linux/ktime.h>],
                     [struct timespec64 *s;
                     ktime_get_coarse_real_ts64(s);])
 AC_CHECK_LINUX_FUNC([ktime_get_real_ts64],
-- 
1.7.1