evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "staging: android: sync: Limit sync log dumping"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-21 09:41:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3cbe2d2e4e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/android/sync.c
View file

@ -29,6 +29,7 @@
#include "sync.h" #include "sync.h"
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#define SYNC_DUMP_TIME_LIMIT 7000
#include "trace/sync.h" #include "trace/sync.h"
static const struct fence_ops android_fence_ops; static const struct fence_ops android_fence_ops;
@ -392,7 +393,9 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
if (timeout) { if (timeout) {
pr_info("fence timeout on [%pK] after %dms\n", fence, pr_info("fence timeout on [%pK] after %dms\n", fence,
jiffies_to_msecs(timeout)); jiffies_to_msecs(timeout));
sync_dump(); if (jiffies_to_msecs(timeout) >=
SYNC_DUMP_TIME_LIMIT)
sync_dump();
} }
return -ETIME; return -ETIME;
} }