Philippe Mathieu-Daudé <phi...@redhat.com> writes:
> This function is now only called within op_helper.c.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
(although if we move the tlb related bits that might be different)
> ---
> target/arm/internals.h | 3 ---
> target/arm/op_helper.c | 5 +++--
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/target/arm/internals.h b/target/arm/internals.h
> index 37ca493635..06e676bf62 100644
> --- a/target/arm/internals.h
> +++ b/target/arm/internals.h
> @@ -767,9 +767,6 @@ bool arm_cpu_tlb_fill(CPUState *cs, vaddr address, int
> size,
> bool probe, uintptr_t retaddr);
> #endif
>
> -void arm_deliver_fault(ARMCPU *cpu, vaddr addr, MMUAccessType access_type,
> - int mmu_idx, ARMMMUFaultInfo *fi) QEMU_NORETURN;
> -
> /* Return true if the stage 1 translation regime is using LPAE format page
> * tables */
> bool arm_s1_regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx);
> diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
> index e43c99ebf0..63bce32810 100644
> --- a/target/arm/op_helper.c
> +++ b/target/arm/op_helper.c
> @@ -127,8 +127,9 @@ static inline uint32_t merge_syn_data_abort(uint32_t
> template_syn,
> return syn;
> }
>
> -void arm_deliver_fault(ARMCPU *cpu, vaddr addr, MMUAccessType access_type,
> - int mmu_idx, ARMMMUFaultInfo *fi)
> +static void QEMU_NORETURN arm_deliver_fault(ARMCPU *cpu, vaddr addr,
> + MMUAccessType access_type,
> + int mmu_idx, ARMMMUFaultInfo *fi)
> {
> CPUARMState *env = &cpu->env;
> int target_el;
--
Alex Bennée
