Messages in this thread | | | Date | Thu, 12 Jul 2018 14:03:04 -0700 | From | Felix Manlunas <> | Subject | Re: [PATCH 1/2] [RESEND] liquidio: use ktime_get_real_ts64() instead of getnstimeofday64() |
| |
On Wed, Jul 11, 2018 at 02:29:52PM +0200, Arnd Bergmann wrote: > 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> > --- > drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- > drivers/net/ethernet/cavium/liquidio/octeon_console.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c > index 19d03fc24305..30884ad0a509 100644 > --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c > +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c > @@ -687,7 +687,7 @@ static void lio_sync_octeon_time(struct work_struct *work) > lt = (struct lio_time *)sc->virtdptr; > > /* Get time of the day */ > - getnstimeofday64(&ts); > + ktime_get_real_ts64(&ts); > lt->sec = ts.tv_sec; > lt->nsec = ts.tv_nsec; > octeon_swap_8B_data((u64 *)lt, (sizeof(struct lio_time)) / 8); > 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); > -- > 2.9.0 >
Acked-by: Felix Manlunas <felix.manlunas@cavium.com>
| |