diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:23:54 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:23:54 +1000 |
commit | 481c63acba2559139d0b46db0d83caca05c3cf63 (patch) | |
tree | 5b06dbb2a769d6b49a5b2d053383f0f842146b77 /arch/powerpc/mm/hash_utils_64.c | |
parent | 667416f38554eef94485496f3a27b93feb5a9fbb (diff) | |
parent | eacbb218fbbab5923775059f7232a9622dc47b2a (diff) | |
download | linux-stable-481c63acba2559139d0b46db0d83caca05c3cf63.tar.gz linux-stable-481c63acba2559139d0b46db0d83caca05c3cf63.tar.bz2 linux-stable-481c63acba2559139d0b46db0d83caca05c3cf63.zip |
Merge branch 'topic/ppc-kvm' into next
Merge in some commits we're sharing with the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 3dc3dd3ea0b6..8318716e5075 100644 --- 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) |