diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
| commit | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (patch) | |
| tree | 5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc /arch/mips/Kconfig | |
| parent | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (diff) | |
| parent | 50c8308538dc9671490d6cb65259ef0ed79f5d13 (diff) | |
Merge branch 'next/kvm' into mips-for-linux-next
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c1997db9c57..0cb6f5ffeec 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1234,6 +1234,7 @@ config CPU_MIPS32_R2 select CPU_HAS_PREFETCH select CPU_SUPPORTS_32BIT_KERNEL select CPU_SUPPORTS_HIGHMEM + select HAVE_KVM help Choose this option to build a kernel for release 2 or later of the MIPS32 architecture. Most modern embedded systems with a 32-bit @@ -1734,6 +1735,20 @@ config 64BIT endchoice +config KVM_GUEST + bool "KVM Guest Kernel" + help + Select this option if building a guest kernel for KVM (Trap & Emulate) mode + +config KVM_HOST_FREQ + int "KVM Host Processor Frequency (MHz)" + depends on KVM_GUEST + default 500 + help + Select this option if building a guest kernel for KVM to skip + RTC emulation when determining guest CPU Frequency. Instead, the guest + processor frequency is automatically derived from the host frequency. + choice prompt "Kernel page size" default PAGE_SIZE_4KB @@ -2014,6 +2029,7 @@ config SB1_PASS_2_1_WORKAROUNDS depends on CPU_SB1 && CPU_SB1_PASS_2 default y + config 64BIT_PHYS_ADDR bool @@ -2547,3 +2563,5 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + +source "arch/mips/kvm/Kconfig" |