summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-21 09:41:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-21 09:41:36 -0700
commit3cbe2d2e4ef5e95e314ea54ebdd3b2c515b26390 (patch)
treefc47bfa0650301e94c543b9d6245f17d86ae299c
parent9b9651811ba8a91967fed385193e6cf42a8bc89d (diff)
parent5ef49cfc5b0eb987598bf615d85da7e48d498934 (diff)
Merge "staging: android: sync: Limit sync log dumping"
-rw-r--r--drivers/staging/android/sync.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 9b8d17ce3a5e..5238d67490ce 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -29,6 +29,7 @@
#include "sync.h"
#define CREATE_TRACE_POINTS
+#define SYNC_DUMP_TIME_LIMIT 7000
#include "trace/sync.h"
static const struct fence_ops android_fence_ops;
@@ -392,7 +393,9 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
if (timeout) {
pr_info("fence timeout on [%pK] after %dms\n", fence,
jiffies_to_msecs(timeout));
- sync_dump();
+ if (jiffies_to_msecs(timeout) >=
+ SYNC_DUMP_TIME_LIMIT)
+ sync_dump();
}
return -ETIME;
}