diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:10:24 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-09 22:10:24 -0500 |
| commit | 69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03 (patch) | |
| tree | f4ad376b3aaf2b68e9066df3885ee8dd297251cb /arch/mips/kernel/genex.S | |
| parent | 35a27eab6f94e15fa30f7662af00fbec50526f4a (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel/genex.S')
| -rw-r--r-- | arch/mips/kernel/genex.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index ac35e12cb1f3..a5e26dd90592 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
| @@ -358,6 +358,7 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
| 358 | .set push | 358 | .set push |
| 359 | /* gas fails to assemble cfc1 for some archs (octeon).*/ \ | 359 | /* gas fails to assemble cfc1 for some archs (octeon).*/ \ |
| 360 | .set mips1 | 360 | .set mips1 |
| 361 | SET_HARDFLOAT | ||
| 361 | cfc1 a1, fcr31 | 362 | cfc1 a1, fcr31 |
| 362 | li a2, ~(0x3f << 12) | 363 | li a2, ~(0x3f << 12) |
| 363 | and a2, a1 | 364 | and a2, a1 |