diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-06-12 16:48:38 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-06-12 16:48:38 +0100 |
| commit | 63917f0b5ba2a932d4fca7f67d1a1eae9034269e (patch) | |
| tree | 2e5b219ca98b56868136e227601a91143d289daf /arch/arm64/Makefile | |
| parent | d822d2a1e33144967b01f9535ce217639aa75279 (diff) | |
| parent | aa4a73a0a23a65a2f531d01f1865d1e61c6acb55 (diff) | |
Merge branch 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into upstream
* 'kvm-arm64/kvm-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms: (33 commits)
arm64: KVM: document kernel object mappings in HYP
arm64: KVM: MAINTAINERS update
arm64: KVM: userspace API documentation
arm64: KVM: enable initialization of a 32bit vcpu
arm64: KVM: 32bit guest fault injection
arm64: KVM: 32bit specific register world switch
arm64: KVM: CPU specific 32bit coprocessor access
arm64: KVM: 32bit handling of coprocessor traps
arm64: KVM: 32bit conditional execution emulation
arm64: KVM: 32bit GP register access
arm64: KVM: define 32bit specific registers
arm64: KVM: Build system integration
arm64: KVM: PSCI implementation
arm64: KVM: Plug the arch timer
ARM: KVM: timer: allow DT matching for ARMv8 cores
arm64: KVM: Plug the VGIC
arm64: KVM: Exit handling
arm64: KVM: HYP mode world switch implementation
arm64: KVM: hypervisor initialization code
arm64: KVM: guest one-reg interface
...
Conflicts:
arch/arm64/Makefile
Diffstat (limited to 'arch/arm64/Makefile')
| -rw-r--r-- | arch/arm64/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 79dd13dc883..741f04fd636 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -37,7 +37,8 @@ TEXT_OFFSET := 0x00080000 export TEXT_OFFSET GZFLAGS core-y += arch/arm64/kernel/ arch/arm64/mm/ -core-$(CONFIG_XEN) += arch/arm64/xen/ +core-$(CONFIG_KVM) += arch/arm64/kvm/ +core-$(CONFIG_XEN) += arch/arm64/xen/ libs-y := arch/arm64/lib/ $(libs-y) libs-y += $(LIBGCC) |