From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2020 03:14:18 +0000 (-0700)
Subject: Merge tag 'riscv-for-linus-5.8-mw0' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=435faf5c218a47fd6258187f62d9bb1009717896;p=linux.git

Merge tag 'riscv-for-linus-5.8-mw0' of git://git./linux/kernel/git/riscv/linux

Pull RISC-V updates from Palmer Dabbelt:

 - The remainder of the code necessary to support the Kendryte K210:

     * Support for building device trees into the kernel, as the K210
       doesn't have a bootloader that provides one

     * A K210 device tree and the associated defconfig update

     * Support for skipping PMP initialization on systems that trap on
       PMP accesses rather than treating them as WARL

 - Support for KGDB

 - Improvements to text patching

 - Some cleanups to the SiFive L2 cache driver

* tag 'riscv-for-linus-5.8-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  soc: sifive: l2 cache: Mark l2_get_priv_group as static
  soc: sifive: l2 cache: Eliminate an unsigned zero compare warning
  riscv: Add support to determine no. of L2 cache way enabled
  riscv: cacheinfo: Implement cache_get_priv_group with a generic ops structure
  riscv: Use text_mutex instead of patch_lock
  riscv: Use NOKPROBE_SYMBOL() instead of __krpobes annotation
  riscv: Remove the 'riscv_' prefix of function name
  riscv: Add SW single-step support for KDB
  riscv: Use the XML target descriptions to report 3 system registers
  riscv: Add KGDB support
  kgdb: Add kgdb_has_hit_break function
  RISC-V: Skip setting up PMPs on traps
  riscv: K210: Update defconfig
  riscv: K210: Add a built-in device tree
  riscv: Allow device trees to be built into the kernel
---

435faf5c218a47fd6258187f62d9bb1009717896
diff --cc arch/riscv/mm/init.c
index 939159b13a135,c18b3db4c5071..34327407b0c57
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@@ -17,9 -17,9 +17,10 @@@
  #include <asm/fixmap.h>
  #include <asm/tlbflush.h>
  #include <asm/sections.h>
+ #include <asm/soc.h>
  #include <asm/pgtable.h>
  #include <asm/io.h>
 +#include <asm/ptdump.h>
  
  #include "../kernel/head.h"