diff options
| author | Arnd Bergmann | 2018-07-11 14:29:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-12 23:55:39 +0200 |
| commit | 44c58899b09d6cbf113f50465215fc66258461df (patch) | |
| tree | 35712d7888c509f11ec6e7633a5d433b070ec1b5 /drivers/net/ethernet/cavium/liquidio/octeon_console.c | |
| parent | Merge branch 'net-sched-act_skbedit-lockless-data-path' (diff) | |
| download | kernel-qcow2-linux-44c58899b09d6cbf113f50465215fc66258461df.tar.gz kernel-qcow2-linux-44c58899b09d6cbf113f50465215fc66258461df.tar.xz kernel-qcow2-linux-44c58899b09d6cbf113f50465215fc66258461df.zip | |
liquidio: use ktime_get_real_ts64() instead of getnstimeofday64()
The two do the same thing, but we want to have a consistent
naming in the kernel.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_console.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c index 7f97ae48efed..0cc2338d8d2a 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -902,7 +902,7 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data, * * Octeon always uses UTC time. so timezone information is not sent. */ - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); ret = snprintf(boottime, MAX_BOOTTIME_SIZE, " time_sec=%lld time_nsec=%ld", (s64)ts.tv_sec, ts.tv_nsec); |