Merge tag 'mips_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:

 - removed get_fs/set_fs

 - removed broken/unmaintained MIPS KVM trap and emulate support

 - added support for Loongson-2K1000

 - fixes and cleanups

* tag 'mips_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (107 commits)
  MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.
  MIPS: select ARCH_KEEP_MEMBLOCK unconditionally
  mips: Do not include hi and lo in clobber list for R6
  MIPS:DTS:Correct the license for Loongson-2K
  MIPS:DTS:Fix label name and interrupt number of ohci for Loongson-2K
  MIPS: Avoid handcoded DIVU in `__div64_32' altogether
  lib/math/test_div64: Correct the spelling of "dividend"
  lib/math/test_div64: Fix error message formatting
  mips/bootinfo:correct some comments of fw_arg
  MIPS: Avoid DIVU in `__div64_32' is result would be zero
  MIPS: Reinstate platform `__div64_32' handler
  div64: Correct inline documentation for `do_div'
  lib/math: Add a `do_div' test module
  MIPS: Makefile: Replace -pg with CC_FLAGS_FTRACE
  MIPS: pci-legacy: revert "use generic pci_enable_resources"
  MIPS: Loongson64: Add kexec/kdump support
  MIPS: pci-legacy: use generic pci_enable_resources
  MIPS: pci-legacy: remove busn_resource field
  MIPS: pci-legacy: remove redundant info messages
  MIPS: pci-legacy: stop using of_pci_range_to_resource
  ...

diff --cc arch/mips/configs/malta_kvm_defconfig
Simple merge

diff --cc arch/mips/configs/maltaup_xpa_defconfig
Simple merge

diff --cc arch/mips/ralink/mt7621.c
index 5d74fc1c96acc18d6d44d92e15c7d34b080ac80b,6b3db98894cbc1cbc6e06175cac1d6483bdafbb0..f82ad2a621f65826918b75775d46a0aa61b46189
--- 1/arch/mips/ralink/mt7621.c
--- 2/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@@ -110,10 -114,30 +114,30 @@@ phys_addr_t mips_cpc_default_phys_base(
        panic("Cannot detect cpc address");
  }
  
+ static void __init mt7621_memory_detect(void)
+ {
+       void *dm = &detect_magic;
+       phys_addr_t size;
+ 
+       for (size = 32 * SZ_1M; size < 256 * SZ_1M; size <<= 1) {
+               if (!__builtin_memcmp(dm, dm + size, sizeof(detect_magic)))
+                       break;
+       }
+ 
+       if ((size == 256 * SZ_1M) &&
+           (CPHYSADDR(dm + size) < MT7621_LOWMEM_MAX_SIZE) &&
+           __builtin_memcmp(dm, dm + size, sizeof(detect_magic))) {
+               memblock_add(MT7621_LOWMEM_BASE, MT7621_LOWMEM_MAX_SIZE);
+               memblock_add(MT7621_HIGHMEM_BASE, MT7621_HIGHMEM_SIZE);
+       } else {
+               memblock_add(MT7621_LOWMEM_BASE, size);
+       }
+ }
+ 
  void __init ralink_of_remap(void)
  {
 -      rt_sysc_membase = plat_of_remap_node("mtk,mt7621-sysc");
 -      rt_memc_membase = plat_of_remap_node("mtk,mt7621-memc");
 +      rt_sysc_membase = plat_of_remap_node("mediatek,mt7621-sysc");
 +      rt_memc_membase = plat_of_remap_node("mediatek,mt7621-memc");
  
        if (!rt_sysc_membase || !rt_memc_membase)
                panic("Failed to remap core resources");

diff --cc lib/Kconfig.debug
Simple merge