Received-SPF: pass (google.com: domain of linux-kernel+bounces-149331-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Charlie Jenkins <charlie@rivosinc.com>
Date: Wed, 17 Apr 2024 16:49:48 -0700
Subject: [PATCH riscv/for-next] riscv: cacheflush: Fix warning when
 compiled without CONFIG_SMP
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240417-fix_nosmp_icache-v1-1-921a3c07d4ce@rivosinc.com>
To: Paul Walmsley <paul.walmsley@sifive.com>, 
 Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, 
 Atish Patra <atishp@rivosinc.com>, 
 Samuel Holland <samuel.holland@sifive.com>, 
 Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: Palmer Dabbelt <palmer@rivosinc.com>, linux-riscv@lists.infradead.org, 
 linux-kernel@vger.kernel.org, Charlie Jenkins <charlie@rivosinc.com>, 
 kernel test robot <lkp@intel.com>

GCC tries to compile the static function set_icache_stale_mask() even
when there are no callers. Guard the function with #ifdef CONFIG_SMP.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: 383289e4b071 ("riscv: Include riscv_set_icache_flush_ctx prctl")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202404180621.qG7A9Tk0-lkp@intel.com/
---
Since this is just in for-next Palmer do you want to squash this onto the
commit that introduced this 383289e4b071?
---
 arch/riscv/mm/cacheflush.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c
index 3b03534e57b4..3ef666c7dfc7 100644
--- a/arch/riscv/mm/cacheflush.c
+++ b/arch/riscv/mm/cacheflush.c
@@ -154,6 +154,7 @@ void __init riscv_init_cbo_blocksizes(void)
 		riscv_cboz_block_size = cboz_block_size;
 }
 
+#ifdef CONFIG_SMP
 static void set_icache_stale_mask(void)
 {
 	cpumask_t *mask;
@@ -171,6 +172,7 @@ static void set_icache_stale_mask(void)
 	cpumask_setall(mask);
 	cpumask_assign_cpu(smp_processor_id(), mask, stale_cpu);
 }
+#endif
 
 /**
  * riscv_set_icache_flush_ctx() - Enable/disable icache flushing instructions in

---
base-commit: a76716f0ec75b9e7ac62d30854d690044c857684
change-id: 20240417-fix_nosmp_icache-0fc36aeafbe5
-- 
- Charlie