diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
| commit | ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f (patch) | |
| tree | 7c0e2b94dfd54811714ad06705bf80df39a1f4e5 /arch/powerpc/kvm/book3s_hv_ras.c | |
| parent | bf65014d0b89b4e315f216f1f65b0d3410efcdc0 (diff) | |
| parent | 6ccad8cea5bcb0660f56677a5fdc52265f8ddf76 (diff) | |
| download | blackbird-op-linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.tar.gz blackbird-op-linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.zip | |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
PPC KVM update for 4.10:
* Support for KVM guests on POWER9 using the hashed page table MMU.
* Updates and improvements to the halt-polling support on PPC, from
Suraj Jitindar Singh.
* An optimization to speed up emulated MMIO, from Yongji Xie.
* Various other minor cleanups.
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_ras.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_ras.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c index 0fa70a9618d7..be1cee5dc032 100644 --- a/arch/powerpc/kvm/book3s_hv_ras.c +++ b/arch/powerpc/kvm/book3s_hv_ras.c @@ -16,6 +16,7 @@ #include <asm/machdep.h> #include <asm/cputhreads.h> #include <asm/hmi.h> +#include <asm/asm-prototypes.h> /* SRR1 bits for machine check on POWER7 */ #define SRR1_MC_LDSTERR (1ul << (63-42)) |
