From 1471279203a2675bca066229a46fe6ab87567b68 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 14 Jan 2025 16:54:39 +0100 Subject: [PATCH] panfrost: avoid accidental aliasing We already have a variable call "alignment" here, and aliasing it breaks things. Whoops, let's rename the variable to page_size to avoid this. Fixes: 22985caf3ff ("panfrost: sanity-check alignment") Reviewed-by: Boris Brezillon Reviewed-by: Eric R. Smith Part-of: --- src/gallium/drivers/panfrost/pan_mempool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_mempool.c b/src/gallium/drivers/panfrost/pan_mempool.c index 4f5613297e6..31b638cf710 100644 --- a/src/gallium/drivers/panfrost/pan_mempool.c +++ b/src/gallium/drivers/panfrost/pan_mempool.c @@ -142,9 +142,9 @@ panfrost_pool_alloc_aligned(struct panfrost_pool *pool, size_t sz, #ifdef PAN_DBG_OVERFLOW if (unlikely(pool->dev->debug & PAN_DBG_OVERFLOW) && !(pool->create_flags & PAN_BO_INVISIBLE)) { - long alignment = sysconf(_SC_PAGESIZE); - assert(alignment > 0 && util_is_power_of_two_nonzero(alignment)); - unsigned aligned = ALIGN_POT(sz, alignment); + long page_size = sysconf(_SC_PAGESIZE); + assert(page_size > 0 && util_is_power_of_two_nonzero(page_size)); + unsigned aligned = ALIGN_POT(sz, page_size); unsigned bo_size = aligned + PAN_GUARD_SIZE; bo = panfrost_pool_alloc_backing(pool, bo_size);