aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-06-08 14:04:05 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-06-08 14:04:05 +0200
commite9ae9f67d8fbae716b0310ef1866632edf627634 (patch)
tree8e3581566cc84432ea9f8af5c28dff6fbb22c01c /lib/kernel/src
parent9ff377471267934cb222a5468e413ed00e12ace1 (diff)
parent2150c3a4dff01eef9479cbdb14e2a2d2b4cbe467 (diff)
downloadotp-e9ae9f67d8fbae716b0310ef1866632edf627634.tar.gz
otp-e9ae9f67d8fbae716b0310ef1866632edf627634.tar.bz2
otp-e9ae9f67d8fbae716b0310ef1866632edf627634.zip
Merge branch 'egil/fix-inet_res'
* egil/fix-inet_res: kernel: Fix inet time conversion
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/inet_db.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl
index abe207295f..535c11271e 100644
--- a/lib/kernel/src/inet_db.erl
+++ b/lib/kernel/src/inet_db.erl
@@ -1372,7 +1372,7 @@ cache_rr(_Db, Cache, RR) ->
ets:insert(Cache, RR).
times() ->
- erlang:monotonic_time(1).
+ erlang:convert_time_unit(erlang:monotonic_time() - erlang:system_info(start_time),native,seconds).
%% lookup and remove old entries