aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/intel_cacheinfo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 51b5dfd67163..03f93c5dcfb3 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -144,7 +144,7 @@ struct _cpuid4_info_regs {
144 unsigned long can_disable; 144 unsigned long can_disable;
145}; 145};
146 146
147#ifdef CONFIG_PCI 147#if defined(CONFIG_PCI) && defined(CONFIG_SYSFS)
148static struct pci_device_id k8_nb_id[] = { 148static struct pci_device_id k8_nb_id[] = {
149 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) }, 149 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
150 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) }, 150 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
@@ -484,6 +484,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
484 return l2; 484 return l2;
485} 485}
486 486
487#ifdef CONFIG_SYSFS
488
487/* pointer to _cpuid4_info array (for each cache leaf) */ 489/* pointer to _cpuid4_info array (for each cache leaf) */
488static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info); 490static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
489#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y])) 491#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y]))
@@ -597,8 +599,6 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
597 return retval; 599 return retval;
598} 600}
599 601
600#ifdef CONFIG_SYSFS
601
602#include <linux/kobject.h> 602#include <linux/kobject.h>
603#include <linux/sysfs.h> 603#include <linux/sysfs.h>
604 604