[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  fdca6f36ded2b31a273c63cd3d09d30b26eaee4f (commit)
      from  02f6b4e7bd0481f452a3aaaa62f51c57bbc7b4f1 (commit)

Summary of changes:
 drivers/dahdi/dahdi-base.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit fdca6f36ded2b31a273c63cd3d09d30b26eaee4f
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Jan 28 20:39:21 2014 +0200

    sysfs: registration_time: use ktime_get_ts
    
    A fix to 03b3ce1a107c4926038931b38894290c074d9e5f: use ktime_get_ts
    instead of getnstimeofday to better handle system time changes.
    (Shaun Ruffell)
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index c7d0607..6994f29 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -50,7 +50,7 @@
 #include <linux/list.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
-#include <linux/time.h>
+#include <linux/ktime.h>
 
 #if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL)
 #include <linux/smp_lock.h>
@@ -7405,7 +7405,7 @@ static int _dahdi_register_device(struct dahdi_device *ddev,
 		__dahdi_init_span(s);
 	}
 
-	getnstimeofday(&ddev->registration_time);
+	ktime_get_ts(&ddev->registration_time);
 	ret = dahdi_sysfs_add_device(ddev, parent);
 	if (ret)
 		return ret;

-----------------------------------------------------------------------


-- 
dahdi/linux.git