diff options
| author | Drew Richardson <drew.richardson@arm.com> | 2014-07-16 12:00:00 -0700 |
|---|---|---|
| committer | Drew Richardson <drew.richardson@arm.com> | 2014-12-19 15:54:51 -0800 |
| commit | 8b39b6c50a01bcfa280151b43079dab428cbab45 (patch) | |
| tree | 66294093e2cd51c0df7afa6d119ec78f65274515 /driver/gator_events_block.c | |
| parent | 020278c1a682ea75ddb63fe4e0d373116935199f (diff) | |
gator: Version 5.195.19
Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Diffstat (limited to 'driver/gator_events_block.c')
| -rw-r--r-- | driver/gator_events_block.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/driver/gator_events_block.c b/driver/gator_events_block.c index b2bc414..03eed4f 100644 --- a/driver/gator_events_block.c +++ b/driver/gator_events_block.c @@ -28,15 +28,25 @@ static ulong block_rq_rd_key; static atomic_t blockCnt[BLOCK_TOTAL]; static int blockGet[BLOCK_TOTAL * 4]; +// Tracepoint changed in 3.15 backported to older kernels. The Makefile tries to autodetect the correct value, but if it fails change the #if below +#if OLD_BLOCK_RQ_COMPLETE GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq)) +#else +GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq, unsigned int nr_bytes)) +#endif { - int write, size; + int write; + unsigned int size; if (!rq) return; write = rq->cmd_flags & EVENTWRITE; +#if OLD_BLOCK_RQ_COMPLETE size = rq->resid_len; +#else + size = nr_bytes; +#endif if (!size) return; |