diff --git a/[refs] b/[refs] index 45a8c168447f..c7b3d2d689db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e378cc16b0d3c1610857c4444345907020e03ece +refs/heads/master: 6c26e03b2db4b66d79bfb774628c1fc9b458b943 diff --git a/trunk/arch/ppc/kernel/traps.c b/trunk/arch/ppc/kernel/traps.c index aec225b402ae..002322a1f3ce 100644 --- a/trunk/arch/ppc/kernel/traps.c +++ b/trunk/arch/ppc/kernel/traps.c @@ -679,6 +679,7 @@ void AlignmentException(struct pt_regs *regs) fixed = fix_alignment(regs); if (fixed == 1) { regs->nip += 4; /* skip over emulated instruction */ + emulate_single_step(regs); return; } if (fixed == -EFAULT) {