diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-04 15:17:51 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-04 15:18:08 +0000 |
| commit | fcd081ca77c917c7000f8ab4668e5c863381a4f3 (patch) | |
| tree | 36e1cfa1f3bc291454d7411a51dc0098e37e02c5 /src/sna/kgem.c | |
| parent | 587c4866652e40e1e228b333028114766a6d3b08 (diff) | |
sna: s/active/busy/ to silence compiler warning
kgem.c: In function 'kgem_check_bo':
kgem.c:4768:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]
kgem.c: In function 'kgem_check_many_bo_fenced':
kgem.c:4907:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/kgem.c')
| -rw-r--r-- | src/sna/kgem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index cf1262d5..21f958c9 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -4765,7 +4765,7 @@ bool kgem_check_bo(struct kgem *kgem, ...) int num_exec = 0; int num_pages = 0; bool flush = false; - bool active = true; + bool busy = true; va_start(ap, kgem); while ((bo = va_arg(ap, struct kgem_bo *))) { @@ -4783,7 +4783,7 @@ bool kgem_check_bo(struct kgem *kgem, ...) num_exec++; flush |= bo->flush; - active &= bo->rq != NULL; + busy &= bo->rq != NULL; } va_end(ap); @@ -4806,7 +4806,7 @@ bool kgem_check_bo(struct kgem *kgem, ...) return false; } - if (active) + if (busy) return true; return kgem_flush(kgem, flush); @@ -4904,7 +4904,7 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...) int num_pages = 0; int fenced_size = 0; bool flush = false; - bool active = true; + bool busy = true; va_start(ap, kgem); while ((bo = va_arg(ap, struct kgem_bo *))) { @@ -4938,7 +4938,7 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...) } flush |= bo->flush; - active &= bo->rq != NULL; + busy &= bo->rq != NULL; } va_end(ap); @@ -4977,7 +4977,7 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...) return false; } - if (active) + if (busy) return true; return kgem_flush(kgem, flush); |