diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 21:02:53 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 21:02:53 +0400 |
| commit | 655e194cfee8ba89634228f97f1310df41b45cbb (patch) | |
| tree | 85989f9f14ad53a3797ab5c70093a8181399e669 /arch/arm/Kconfig | |
| parent | 1e044f0490c9d9f26ebcdd3dc63e02790b798821 (diff) | |
| parent | da141b67d29a05267a9a0d56bd7856b7f3f58d44 (diff) | |
| download | linux-655e194cfee8ba89634228f97f1310df41b45cbb.tar.xz | |
Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt
* 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
KVM: ARM: Add maintainer entry for KVM/ARM
KVM: ARM: Power State Coordination Interface implementation
KVM: ARM: Handle I/O aborts
KVM: ARM: Handle guest faults in KVM
KVM: ARM: VFP userspace interface
KVM: ARM: Demux CCSIDR in the userspace API
KVM: ARM: User space API for getting/setting co-proc registers
KVM: ARM: Emulation framework and CP15 emulation
KVM: ARM: World-switch implementation
KVM: ARM: Inject IRQs and FIQs from userspace
KVM: ARM: Memory virtualization setup
KVM: ARM: Hypervisor initialization
KVM: ARM: Initial skeleton to compile KVM support
ARM: Section based HYP idmap
ARM: Add page table and page defines needed by KVM
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67874b82a4ed..e0627cdbcda5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2322,3 +2322,5 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + +source "arch/arm/kvm/Kconfig" |