[PATCH v5 14/21] powerpc/xmon: Move insertion of breakpoint for xol'ing

[Jordan Niethe]

When a new breakpoint is created, the second instruction of that
breakpoint is patched with a trap instruction. This assumes the length
of the instruction is always the same. In preparation for prefixed
instructions, remove this assumption. Insert the trap instruction at the
same time the first instruction is inserted.

Signed-off-by: Jordan Niethe <jniet...@gmail.com>
---
 arch/powerpc/xmon/xmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 6f4cf01a58c1..6f3bcdcfc9c7 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -881,7 +881,6 @@ static struct bpt *new_breakpoint(unsigned long a)
                if (!bp->enabled && atomic_read(&bp->ref_count) == 0) {
                        bp->address = a;
                        bp->instr = (void *)(bpt_table + ((bp - bpts) * 
BPT_WORDS));
-                       patch_instruction(bp->instr + 1, ppc_inst(bpinstr));
                        return bp;
                }
        }
@@ -913,6 +912,7 @@ static void insert_bpts(void)
                        continue;
                }
                patch_instruction(bp->instr, instr);
+               patch_instruction((void *)bp->instr + ppc_inst_len(instr), 
ppc_inst(bpinstr));
                if (bp->enabled & BP_CIABR)
                        continue;
                if (patch_instruction((struct ppc_inst *)bp->address,
-- 
2.17.1