summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>2018-04-09 17:35:39 +0100
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>2018-04-11 09:59:49 +0100
commit27cd3793a3a183e4ec70c392f293e840642f2799 (patch)
tree2b7ce9ad0a903d6ffdb7ecc02eed77dff404b020 /tools
parent2ef96ec9fd445b3ae3e172dacb76a4a0e8eb1bef (diff)
tools/aubdump: Fix ISO C90 forbids mixed declarations and code warning
Back to a clean build with no warnings, at least for me. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Scott D Phillips <scott.d.phillips@intel.com> Reviewed-by: Scott D Phillips <scott.d.phillips@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/aubdump.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/aubdump.c b/tools/aubdump.c
index 267061b0..2d2b6c60 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -394,10 +394,11 @@ gen8_emit_ggtt_pte_for_range(uint64_t start, uint64_t end)
entry_addr = start & ~(4096 - 1);
do {
+ uint64_t last_page_entry, num_entries;
+
page_num = entry_addr >> 21;
- uint64_t last_page_entry =
- min((page_num + 1) << 21, end_aligned);
- uint64_t num_entries = (last_page_entry - entry_addr) >> 12;
+ last_page_entry = min((page_num + 1) << 21, end_aligned);
+ num_entries = (last_page_entry - entry_addr) >> 12;
mem_trace_memory_write_header_out(
entry_addr >> 9, num_entries * GEN8_PTE_SIZE,
AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY);