On 22/4/25 21:26, Richard Henderson wrote:
We were hiding a number of declarations from user-only,
although it hurts nothing to allow them. The inlines
for user-only are unused.
Reviewed-by: Pierrick Bouvier <pierrick.bouv...@linaro.org>
Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
include/hw/intc/armv7m_nvic.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
index 89fe8aedaa..7b9964fe7e 100644
--- a/include/hw/intc/armv7m_nvic.h
+++ b/include/hw/intc/armv7m_nvic.h
@@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
* @secure: the security state to test
* This corresponds to the pseudocode IsReqExecPriNeg().
*/
-#ifndef CONFIG_USER_ONLY
bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
-#else
-static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
-{
- return false;
-}
-#endif
-#ifndef CONFIG_USER_ONLY
bool armv7m_nvic_can_take_pending_exception(NVICState *s);
-#else
-static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
-{
- return true;
-}
-#endif
#endif
This code was pulled in user emulation via cpu_mmu_index() in commit
5d4791991d4 ("target/arm: Handle banking in negative-execution-priority
check in cpu_mmu_index()"). We fought with Thomas to disentangle the
Cortex-M HW from user-emulation. I think I got rid of it in range
9b772b19fcc..165876f22cd ("target/arm: Declare CPU <-> NVIC helpers in
'hw/intc/armv7m_nvic.h'") but neglected to drop the stubs it that final
commit. Anyway, "hw/intc/armv7m_nvic.h" is not used anymore on *USER so:
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
