From 950e6bcc335db96003cb360109a82c8b51e2957f Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Wed, 22 Jun 2016 14:21:03 +0100 Subject: [PATCH] xen/arm: traps: Data Abort are always unconditional The HSR encoding for an exception from a data abort does not contain a conditional code (see G6-4264 in ARM DDI 0487A.i) because they are always conditional. So drop the pointless condition check. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index f7edd23be4..33261222e0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2436,12 +2436,6 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, int rc; mmio_info_t info; - if ( !check_conditional_instr(regs, hsr) ) - { - advance_pc(regs, hsr); - return; - } - info.dabt = dabt; #ifdef CONFIG_ARM_32 info.gva = READ_CP32(HDFAR); -- 2.30.2