Merge branch 'topic/ppc-kvm' into next

Merge in some commits we're sharing with the kvm-ppc tree.
2018-06-03 20:23:54 +10:00
parent 667416f385 eacbb218fb
commit 481c63acba
10 changed files with 260 additions and 12 deletions
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -64,6 +64,7 @@
 #include <asm/trace.h>
 #include <asm/ps3.h>
 #include <asm/pte-walk.h>
+#include <asm/asm-prototypes.h>

 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)