diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 01:37:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-22 01:37:14 +0200 |
| commit | 0903391acbc1b509a60a6cb682344c748a69821a (patch) | |
| tree | 72d673dee7b5c33e2d21698816e35d2673944585 /Makefile | |
| parent | Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cma... (diff) | |
| parent | MIPS: Handle OCTEON BBIT instructions in FPU emulator. (diff) | |
| download | linux-0903391acbc1b509a60a6cb682344c748a69821a.tar.xz linux-0903391acbc1b509a60a6cb682344c748a69821a.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fix from Ralf Baechle:
"Just a single patch which fixes a special case in the MIPS FPU
emulator which is always required, even on CPUs with FPU. There is
the rare special case that an FPU (or certain other instructions) in a
branch delay slot is causing an exception and then the branch
instruction will need to be emulated by the kernel before resuming
execution. This is working great except if the branch instruction is
an Octeon BBIT instruction.
The boring disclaimer - all MIPS defconfigs build tested and no
regressions and runtime tested on Octeon, no known issues"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Handle OCTEON BBIT instructions in FPU emulator.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions