diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2016-09-09 16:24:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2016-09-09 16:24:23 +1000 |
| commit | 99212c864e1f6d2800e62bc8c52d6335bfca029f (patch) | |
| tree | 56ebe0f73108e9d7d6fcd36fda3f78db1b2e328d /arch/powerpc/kvm/Makefile | |
| parent | 2a27f514a47d39c50aaa5c07831ab35178955d47 (diff) | |
| parent | 3f2577749948803491874c6895fec559f3473eab (diff) | |
| download | linux-99212c864e1f6d2800e62bc8c52d6335bfca029f.tar.gz linux-99212c864e1f6d2800e62bc8c52d6335bfca029f.tar.bz2 linux-99212c864e1f6d2800e62bc8c52d6335bfca029f.zip | |
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
This merges the topic branch 'kvm-ppc-infrastructure' into kvm-ppc-next
so that I can then apply further patches that need the changes in the
kvm-ppc-infrastructure branch.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/Makefile')
| -rw-r--r-- | arch/powerpc/kvm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index bd9b82f62f2f..7dd89b79d038 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -77,6 +77,7 @@ kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \ ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \ + book3s_hv_hmi.o \ book3s_hv_rmhandlers.o \ book3s_hv_rm_mmu.o \ book3s_hv_ras.o \ |