git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
timeval.c
diff --git
a/lib/timeval.c
b/lib/timeval.c
index
ef9c8fe
..
2f00355
100644
(file)
--- a/
lib/timeval.c
+++ b/
lib/timeval.c
@@
-516,7
+516,7
@@
log_poll_interval(long long int last_wakeup)
{
long long int interval = time_msec() - last_wakeup;
- if (interval >= 1000) {
+ if (interval >= 1000
&& !warp_offset.tv_sec && !warp_offset.tv_nsec
) {
const struct rusage *last_rusage = get_recent_rusage();
struct rusage rusage;