projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
arch
/
x86_64
/
Kconfig
diff --git
a/arch/x86_64/Kconfig
b/arch/x86_64/Kconfig
index
4310b4a
..
af44130
100644
(file)
--- a/
arch/x86_64/Kconfig
+++ b/
arch/x86_64/Kconfig
@@
-136,6
+136,11
@@
config X86_L1_CACHE_SHIFT
default "7" if GENERIC_CPU || MPSC
default "6" if MK8
default "7" if GENERIC_CPU || MPSC
default "6" if MK8
+config X86_INTERNODE_CACHE_BYTES
+ int
+ default "4096" if X86_VSMP
+ default X86_L1_CACHE_BYTES if !X86_VSMP
+
config X86_TSC
bool
default y
config X86_TSC
bool
default y
@@
-283,12
+288,18
@@
config K8_NUMA
Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
instead, which also takes priority if both are compiled in.
Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
instead, which also takes priority if both are compiled in.
+config NODES_SHIFT
+ int
+ default "6"
+ depends on NEED_MULTIPLE_NODES
+
# Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
config X86_64_ACPI_NUMA
bool "ACPI NUMA detection"
depends on NUMA
select ACPI
# Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
config X86_64_ACPI_NUMA
bool "ACPI NUMA detection"
depends on NUMA
select ACPI
+ select PCI
select ACPI_NUMA
default y
help
select ACPI_NUMA
default y
help
@@
-379,6
+390,7
@@
config GART_IOMMU
bool "K8 GART IOMMU support"
default y
select SWIOTLB
bool "K8 GART IOMMU support"
default y
select SWIOTLB
+ select AGP
depends on PCI
help
Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
depends on PCI
help
Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
@@
-391,11
+403,9
@@
config GART_IOMMU
northbridge and a software emulation used on other systems without
hardware IOMMU. If unsure, say Y.
northbridge and a software emulation used on other systems without
hardware IOMMU. If unsure, say Y.
-# need this always
enabled with
GART_IOMMU for the VIA workaround
+# need this always
selected by
GART_IOMMU for the VIA workaround
config SWIOTLB
bool
config SWIOTLB
bool
- default y
- depends on GART_IOMMU
config X86_MCE
bool "Machine check support" if EMBEDDED
config X86_MCE
bool "Machine check support" if EMBEDDED