From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Oct 2020 19:40:55 +0000 (-0700)
Subject: Merge tag 'mips_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Tag: v5.10.7~1397
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09a31a7e3723afd79022d5d3ff3634c2630c2eeb;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mips_5.10' of git://git./linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:

 - removed support for PNX833x alias NXT_STB22x

 - included Ingenic SoC support into generic MIPS kernels

 - added support for new Ingenic SoCs

 - converted workaround selection to use Kconfig

 - replaced old boot mem functions by memblock_*

 - enabled COP2 usage in kernel for Loongson64 to make use
   of 16byte load/stores possible

 - cleanups and fixes

* tag 'mips_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (92 commits)
  MIPS: DEC: Restore bootmem reservation for firmware working memory area
  MIPS: dec: fix section mismatch
  bcm963xx_tag.h: fix duplicated word
  mips: ralink: enable zboot support
  MIPS: ingenic: Remove CPU_SUPPORTS_HUGEPAGES
  MIPS: cpu-probe: remove MIPS_CPU_BP_GHIST option bit
  MIPS: cpu-probe: introduce exclusive R3k CPU probe
  MIPS: cpu-probe: move fpu probing/handling into its own file
  MIPS: replace add_memory_region with memblock
  MIPS: Loongson64: Clean up numa.c
  MIPS: Loongson64: Select SMP in Kconfig to avoid build error
  mips: octeon: Add Ubiquiti E200 and E220 boards
  MIPS: SGI-IP28: disable use of ll/sc in kernel
  MIPS: tx49xx: move tx4939_add_memory_regions into only user
  MIPS: pgtable: Remove used PAGE_USERIO define
  MIPS: alchemy: Share prom_init implementation
  MIPS: alchemy: Fix build breakage, if TOUCHSCREEN_WM97XX is disabled
  MIPS: process: include exec.h header in process.c
  MIPS: process: Add prototype for function arch_dup_task_struct
  MIPS: idle: Add prototype for function check_wait
  ...
---

09a31a7e3723afd79022d5d3ff3634c2630c2eeb
diff --cc arch/mips/include/asm/mach-loongson64/mmzone.h
index 5eaca4f,c3f0f7a..ebb1dea
--- a/arch/mips/include/asm/mach-loongson64/mmzone.h
+++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
@@@ -9,14 -9,11 +9,10 @@@
  #ifndef _ASM_MACH_LOONGSON64_MMZONE_H
  #define _ASM_MACH_LOONGSON64_MMZONE_H
  
 -#include <boot_param.h>
  #define NODE_ADDRSPACE_SHIFT 44
- #define NODE0_ADDRSPACE_OFFSET 0x000000000000UL
- #define NODE1_ADDRSPACE_OFFSET 0x100000000000UL
- #define NODE2_ADDRSPACE_OFFSET 0x200000000000UL
- #define NODE3_ADDRSPACE_OFFSET 0x300000000000UL
  
  #define pa_to_nid(addr)  (((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT)
- #define nid_to_addrbase(nid) ((nid) << NODE_ADDRSPACE_SHIFT)
+ #define nid_to_addrbase(nid) ((unsigned long)(nid) << NODE_ADDRSPACE_SHIFT)
  
  extern struct pglist_data *__node_data[];
  
diff --cc arch/mips/kernel/setup.c
index ee8636c,fb05b66..fccdbe2
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@@ -443,11 -409,10 +405,11 @@@ static int __init early_parse_memmap(ch
  early_param("memmap", early_parse_memmap);
  
  #ifdef CONFIG_PROC_VMCORE
- unsigned long setup_elfcorehdr, setup_elfcorehdr_size;
+ static unsigned long setup_elfcorehdr, setup_elfcorehdr_size;
  static int __init early_parse_elfcorehdr(char *p)
  {
 -	struct memblock_region *mem;
 +	phys_addr_t start, end;
 +	u64 i;
  
  	setup_elfcorehdr = memparse(p, &p);