Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core

irqchip core changes for v3.18

 - renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
 - keystone: add new driver
 - hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
 - gic: Use defines instead of magic number, preserve v2 bybass bits
 - handle_domain_irq: common low level interrupt entry handler

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 1812f026960..daa8e7514ea 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -306,11 +306,9 @@ static struct nsm_handle *nsm_lookup_priv(const struct nsm_private *priv)
 static void nsm_init_private(struct nsm_handle *nsm)
 {
 	u64 *p = (u64 *)&nsm->sm_priv.data;
-	struct timespec ts;
 	s64 ns;
 
-	ktime_get_ts(&ts);
-	ns = timespec_to_ns(&ts);
+	ns = ktime_get_ns();
 	put_unaligned(ns, p);
 	put_unaligned((unsigned long)nsm, p + 1);
 }