64035ac463
Prepare for better device categorization by moving everything to testing subdir first. [skip-ci]: chicken-egg problem: passing pmaports CI depends on pmbootstrap MR depends on this MR Related: postmarketos#16
21 lines
709 B
Diff
21 lines
709 B
Diff
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
|
|
index cfbcf8b9559..54587d394d3 100644
|
|
--- a/arch/arm/mm/alignment.c
|
|
+++ b/arch/arm/mm/alignment.c
|
|
@@ -698,7 +698,6 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
|
|
unsigned long instr = *pinstr;
|
|
u16 tinst1 = (instr >> 16) & 0xffff;
|
|
u16 tinst2 = instr & 0xffff;
|
|
- poffset->un = 0;
|
|
|
|
switch (tinst1 & 0xffe0) {
|
|
/* A6.3.5 Load/Store multiple */
|
|
@@ -795,6 +794,8 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
|
|
|
|
regs->ARM_pc += isize;
|
|
|
|
+ offset.un = 0;
|
|
+
|
|
switch (CODING_BITS(instr)) {
|
|
case 0x00000000: /* 3.13.4 load/store instruction extensions */
|
|
if (LDSTHD_I_BIT(instr))
|