diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
| commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
| tree | 060c52298d42530f975064f7addc4e637fe00289 /arch/x86/Kconfig | |
| parent | f22f9a89ce6857d377bf22dba4c1a8cd256c5136 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | linux-3.10-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.gz linux-3.10-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.bz2 linux-3.10-97e6722b8d6b5880c4d5751127d5083b1b7df27d.zip | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b0937c03af3..40013514855 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -385,6 +385,7 @@ config VMI config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT + select PARAVIRT_CLOCK depends on !(X86_VISWS || X86_VOYAGER) help Turning on this option will allow you to run a paravirtualized clock @@ -412,6 +413,10 @@ config PARAVIRT over full virtualization. However, when run without a hypervisor the kernel is theoretically slower and slightly larger. +config PARAVIRT_CLOCK + bool + default n + endif config MEMTEST_BOOTPARAM |