]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/lib: Fix feature fixup test of external branch
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 16 Apr 2018 14:39:02 +0000 (00:39 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 11 May 2018 13:29:02 +0000 (23:29 +1000)
commit880bf6b9acb8bafdca97e2c383b13b9ce63a6c2c
treee147b9b7e9da4f45fcef9a7d54034c3de2da0508
parent1efe5f97b9701b9b818d23f39a7cfd2e2c113ac2
powerpc/lib: Fix feature fixup test of external branch

The expected case for this test was wrong, the source of the alternate
code sequence is:

  FTR_SECTION_ELSE
  2: or 2,2,2
   PPC_LCMPI r3,1
   beq 3f
   blt 2b
   b 3f
   b 1b
  ALT_FTR_SECTION_END(0, 1)
  3: or 1,1,1
   or 2,2,2
  4: or 3,3,3

So when it's patched the '3' label should still be on the 'or 1,1,1',
and the 4 label is irrelevant and can be removed.

Fixes: 665f0ebf2913 ("powerpc: Add self-tests of the feature fixup code")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/lib/feature-fixups-test.S