diff --git a/debian/changelog b/debian/changelog
index f22cb737f..87793952d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 linux (4.19.98-2) UNRELEASED; urgency=medium
 
+  [ Salvatore Bonaccorso ]
   * do_last(): fetch directory ->i_mode and ->i_uid before it's too late
     (CVE-2020-8428)
   * vfs: fix do_last() regression
 
+  [ YunQiang Su ]
+  * [mips*] enable CONFIG_MIPS_O32_FP64_SUPPORT.
+  * [mips*] enable CONFIG_CPU_HAS_MSA except octeon.
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 29 Jan 2020 06:52:57 +0100
 
 linux (4.19.98-1) buster; urgency=medium
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index e6fc5a3b4..683a871b7 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -1,6 +1,7 @@
 ##
 ## file: arch/mips/Kconfig
 ##
+CONFIG_CPU_HAS_MSA=y
 CONFIG_RELOCATABLE=y
 CONFIG_RELOCATION_TABLE_SIZE=0x00140000
 CONFIG_RANDOMIZE_BASE=y
@@ -8,6 +9,7 @@ CONFIG_KEXEC=y
 CONFIG_SECCOMP=y
 CONFIG_PCI=y
 # CONFIG_RAPIDIO is not set
+CONFIG_MIPS_O32_FP64_SUPPORT=y
 #. Ignored in 32-bit configurations
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston
index ef96201f2..20178e150 100644
--- a/debian/config/kernelarch-mips/config.boston
+++ b/debian/config/kernelarch-mips/config.boston
@@ -5,7 +5,6 @@
 CONFIG_MIPS_GENERIC=y
 ## end choice
 CONFIG_MIPS_CPS=y
-CONFIG_CPU_HAS_MSA=y
 CONFIG_HIGHMEM=y
 CONFIG_NR_CPUS=16
 
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 7b05c4ba4..dbd98f0b5 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -8,6 +8,7 @@ CONFIG_CAVIUM_OCTEON_SOC=y
 # CONFIG_32BIT is not set
 CONFIG_64BIT=y
 ## end choice
+# CONFIG_CPU_HAS_MSA is not set
 CONFIG_SMP=y
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_NR_CPUS=64