diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:31:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:31:14 +0200 |
| commit | 607baf1f4ef94637ab0f7d0e258932851dc5c0a2 (patch) | |
| tree | e5e3ed753fdad4eef8aaed2562df2a1148cec4ab /arch/x86/Kconfig | |
| parent | 064a32d82c20cdcb0119a8b316eb520608d8c647 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | linux-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.tar.gz linux-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.tar.bz2 linux-607baf1f4ef94637ab0f7d0e258932851dc5c0a2.zip | |
Merge branch 'linus' into x86/memtest
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 2d7dc4107764..d69c102786ad 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -383,6 +383,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 @@ -410,6 +411,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 |