diff options
| author | Paul Burton <paulburton@kernel.org> | 2019-11-01 22:35:49 +0100 |
|---|---|---|
| committer | Paul Burton <paulburton@kernel.org> | 2019-11-01 22:36:44 +0100 |
| commit | 02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5 (patch) | |
| tree | 20e69aae8d0acfcd7edc954e70a9d751e0b54a7e /arch/mips/loongson64/Platform | |
| parent | MIPS: Loongson: Make default kernel log buffer size as 128KB for Loongson3 (diff) | |
| parent | MIPS: tlbex: Fix build_restore_pagemask KScratch restore (diff) | |
| download | linux-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.tar.xz linux-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.zip | |
Merge tag 'mips_fixes_5.4_3' into mips-next
Pull in mips-fixes primarily to gain build fixes in order to allow
better testing of mips-next.
A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need to
fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where they
would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address.
Signed-off-by: Paul Burton <paulburton@kernel.org>
Diffstat (limited to 'arch/mips/loongson64/Platform')
| -rw-r--r-- | arch/mips/loongson64/Platform | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform index a1efea6ce6bb..d5eb94c9edb4 100644 --- a/arch/mips/loongson64/Platform +++ b/arch/mips/loongson64/Platform @@ -47,6 +47,10 @@ else $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64) endif +# Some -march= flags enable MMI instructions, and GCC complains about that +# support being enabled alongside -msoft-float. Thus explicitly disable MMI. +cflags-y += $(call cc-option,-mno-loongson-mmi) + # # Loongson Machines' Support # |