diff options
| -rw-r--r-- | arch/x86/kernel/cpu/intel_cacheinfo.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index d763d24187c2..1677b55371a5 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
| @@ -135,11 +135,13 @@ struct _cpuid4_info { | |||
| 135 | cpumask_t shared_cpu_map; /* future?: only cpus/node is needed */ | 135 | cpumask_t shared_cpu_map; /* future?: only cpus/node is needed */ |
| 136 | }; | 136 | }; |
| 137 | 137 | ||
| 138 | #ifdef CONFIG_PCI | ||
| 138 | static struct pci_device_id k8_nb_id[] = { | 139 | static struct pci_device_id k8_nb_id[] = { |
| 139 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) }, | 140 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) }, |
| 140 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) }, | 141 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) }, |
| 141 | {} | 142 | {} |
| 142 | }; | 143 | }; |
| 144 | #endif | ||
| 143 | 145 | ||
| 144 | unsigned short num_cache_leaves; | 146 | unsigned short num_cache_leaves; |
| 145 | 147 | ||
| @@ -663,6 +665,7 @@ static ssize_t show_type(struct _cpuid4_info *this_leaf, char *buf) { | |||
| 663 | #define to_object(k) container_of(k, struct _index_kobject, kobj) | 665 | #define to_object(k) container_of(k, struct _index_kobject, kobj) |
| 664 | #define to_attr(a) container_of(a, struct _cache_attr, attr) | 666 | #define to_attr(a) container_of(a, struct _cache_attr, attr) |
| 665 | 667 | ||
| 668 | #ifdef CONFIG_PCI | ||
| 666 | static struct pci_dev *get_k8_northbridge(int node) | 669 | static struct pci_dev *get_k8_northbridge(int node) |
| 667 | { | 670 | { |
| 668 | struct pci_dev *dev = NULL; | 671 | struct pci_dev *dev = NULL; |
| @@ -679,6 +682,12 @@ static struct pci_dev *get_k8_northbridge(int node) | |||
| 679 | } | 682 | } |
| 680 | return dev; | 683 | return dev; |
| 681 | } | 684 | } |
| 685 | #else | ||
| 686 | static struct pci_dev *get_k8_northbridge(int node) | ||
| 687 | { | ||
| 688 | return NULL; | ||
| 689 | } | ||
| 690 | #endif | ||
| 682 | 691 | ||
| 683 | static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf) | 692 | static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf) |
| 684 | { | 693 | { |
