aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/alignment.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/alignment.c')
-rw-r--r--arch/arm/mm/alignment.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 8cdb78642e93..04b36436cbc0 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -695,7 +695,7 @@ thumb2arm(u16 tinstr)
695 return subset[(L<<1) | ((tinstr & (1<<8)) >> 8)] | 695 return subset[(L<<1) | ((tinstr & (1<<8)) >> 8)] |
696 (tinstr & 255); /* register_list */ 696 (tinstr & 255); /* register_list */
697 } 697 }
698 /* Else fall through for illegal instruction case */ 698 /* Else, fall through - for illegal instruction case */
699 699
700 default: 700 default:
701 return BAD_INSTR; 701 return BAD_INSTR;
@@ -751,6 +751,8 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
751 case 0xe8e0: 751 case 0xe8e0:
752 case 0xe9e0: 752 case 0xe9e0:
753 poffset->un = (tinst2 & 0xff) << 2; 753 poffset->un = (tinst2 & 0xff) << 2;
754 /* Fall through */
755
754 case 0xe940: 756 case 0xe940:
755 case 0xe9c0: 757 case 0xe9c0:
756 return do_alignment_ldrdstrd; 758 return do_alignment_ldrdstrd;