diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fc86c54e791..c3a4c03c080 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -28,17 +28,10 @@ config X86 | |||
28 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 28 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
29 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 29 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
30 | 30 | ||
31 | config DEFCONFIG_LIST | 31 | config ARCH_DEFCONFIG |
32 | string | 32 | string |
33 | depends on X86_32 | 33 | default "arch/x86/configs/i386_defconfig" if X86_32 |
34 | option defconfig_list | 34 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
35 | default "arch/x86/configs/i386_defconfig" | ||
36 | |||
37 | config DEFCONFIG_LIST | ||
38 | string | ||
39 | depends on X86_64 | ||
40 | option defconfig_list | ||
41 | default "arch/x86/configs/x86_64_defconfig" | ||
42 | 35 | ||
43 | 36 | ||
44 | config GENERIC_LOCKBREAK | 37 | config GENERIC_LOCKBREAK |
@@ -392,6 +385,7 @@ config VMI | |||
392 | config KVM_CLOCK | 385 | config KVM_CLOCK |
393 | bool "KVM paravirtualized clock" | 386 | bool "KVM paravirtualized clock" |
394 | select PARAVIRT | 387 | select PARAVIRT |
388 | select PARAVIRT_CLOCK | ||
395 | depends on !(X86_VISWS || X86_VOYAGER) | 389 | depends on !(X86_VISWS || X86_VOYAGER) |
396 | help | 390 | help |
397 | Turning on this option will allow you to run a paravirtualized clock | 391 | Turning on this option will allow you to run a paravirtualized clock |
@@ -419,6 +413,10 @@ config PARAVIRT | |||
419 | over full virtualization. However, when run without a hypervisor | 413 | over full virtualization. However, when run without a hypervisor |
420 | the kernel is theoretically slower and slightly larger. | 414 | the kernel is theoretically slower and slightly larger. |
421 | 415 | ||
416 | config PARAVIRT_CLOCK | ||
417 | bool | ||
418 | default n | ||
419 | |||
422 | endif | 420 | endif |
423 | 421 | ||
424 | config MEMTEST_BOOTPARAM | 422 | config MEMTEST_BOOTPARAM |
@@ -970,8 +968,8 @@ config NUMA_EMU | |||
970 | number of nodes. This is only useful for debugging. | 968 | number of nodes. This is only useful for debugging. |
971 | 969 | ||
972 | config NODES_SHIFT | 970 | config NODES_SHIFT |
973 | int "Max num nodes shift(1-15)" | 971 | int "Max num nodes shift(1-9)" |
974 | range 1 15 if X86_64 | 972 | range 1 9 if X86_64 |
975 | default "6" if X86_64 | 973 | default "6" if X86_64 |
976 | default "4" if X86_NUMAQ | 974 | default "4" if X86_NUMAQ |
977 | default "3" | 975 | default "3" |
@@ -1517,13 +1515,13 @@ config PCI_GOMMCONFIG | |||
1517 | config PCI_GODIRECT | 1515 | config PCI_GODIRECT |
1518 | bool "Direct" | 1516 | bool "Direct" |
1519 | 1517 | ||
1520 | config PCI_GOANY | ||
1521 | bool "Any" | ||
1522 | |||
1523 | config PCI_GOOLPC | 1518 | config PCI_GOOLPC |
1524 | bool "OLPC" | 1519 | bool "OLPC" |
1525 | depends on OLPC | 1520 | depends on OLPC |
1526 | 1521 | ||
1522 | config PCI_GOANY | ||
1523 | bool "Any" | ||
1524 | |||
1527 | endchoice | 1525 | endchoice |
1528 | 1526 | ||
1529 | config PCI_BIOS | 1527 | config PCI_BIOS |
@@ -1540,9 +1538,8 @@ config PCI_MMCONFIG | |||
1540 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1538 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1541 | 1539 | ||
1542 | config PCI_OLPC | 1540 | config PCI_OLPC |
1543 | bool | 1541 | def_bool y |
1544 | depends on PCI && PCI_GOOLPC | 1542 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
1545 | default y | ||
1546 | 1543 | ||
1547 | config PCI_DOMAINS | 1544 | config PCI_DOMAINS |
1548 | def_bool y | 1545 | def_bool y |