From: Konrad Lipinski <konrad.l@samsung.com>
Date: Thu, 8 Sep 2016 14:47:33 +0000 (+0200)
Subject: Revert "kdbus: avoid the use of struct timespec"
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3d118839fca847a534e3b952d0fa15aef491e45;p=platform%2Fkernel%2Flinux-exynos.git

Revert "kdbus: avoid the use of struct timespec"

This reverts commit c6c6bf55b3884bfe60db47780b96339eb7739a78.
---

diff --git a/ipc/kdbus/metadata.c b/ipc/kdbus/metadata.c
index 3adc6c2c2e76..06e0a54a276a 100644
--- a/ipc/kdbus/metadata.c
+++ b/ipc/kdbus/metadata.c
@@ -678,8 +678,13 @@ struct kdbus_meta_conn *kdbus_meta_conn_unref(struct kdbus_meta_conn *mc)
 static void kdbus_meta_conn_collect_timestamp(struct kdbus_meta_conn *mc,
 					      struct kdbus_kmsg *kmsg)
 {
-	mc->ts.monotonic_ns = ktime_get_ns();
-	mc->ts.realtime_ns = ktime_get_real_ns();
+	struct timespec ts;
+
+	ktime_get_ts(&ts);
+	mc->ts.monotonic_ns = timespec_to_ns(&ts);
+
+	ktime_get_real_ts(&ts);
+	mc->ts.realtime_ns = timespec_to_ns(&ts);
 
 	if (kmsg)
 		mc->ts.seqnum = kmsg->seq;
diff --git a/ipc/kdbus/reply.c b/ipc/kdbus/reply.c
index 008dca801627..6b3bd81bbb4d 100644
--- a/ipc/kdbus/reply.c
+++ b/ipc/kdbus/reply.c
@@ -204,9 +204,11 @@ void kdbus_reply_list_scan_work(struct work_struct *work)
 		container_of(work, struct kdbus_conn, work.work);
 	struct kdbus_reply *reply, *reply_tmp;
 	u64 deadline = ~0ULL;
+	struct timespec64 ts;
 	u64 now;
 
-	now = ktime_get_ns();
+	ktime_get_ts64(&ts);
+	now = timespec64_to_ns(&ts);
 
 	mutex_lock(&conn->lock);
 	if (!kdbus_conn_active(conn)) {