diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:47:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-07-07 10:47:18 +0800 |
| commit | 49bcf50125c661f45a030edd1a241917f1c7a821 (patch) | |
| tree | d1e0662ea0a4b412f556517d44e2756a75111720 /arch/powerpc/lib/sstep.c | |
| parent | d01bd6fdb3be2f6cec1d5918e20175adca97615b (diff) | |
| parent | 75dca413752fb5cb8a2b8357d3a68f1f7af0cc95 (diff) | |
Merge tag 'v3.10.47' into linux-linaro-lsk
This is the 3.10.47 stable release
Diffstat (limited to 'arch/powerpc/lib/sstep.c')
| -rw-r--r-- | arch/powerpc/lib/sstep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index e15c521846ca..08490ecc465e 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1395,7 +1395,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) regs->gpr[rd] = byterev_4(val); goto ldst_done; -#ifdef CONFIG_PPC_CPU +#ifdef CONFIG_PPC_FPU case 535: /* lfsx */ case 567: /* lfsux */ if (!(regs->msr & MSR_FP)) |