|
@@ -144,7 +144,7 @@ struct _cpuid4_info_regs {
|
|
unsigned long can_disable;
|
|
unsigned long can_disable;
|
|
};
|
|
};
|
|
|
|
|
|
-#ifdef CONFIG_PCI
|
|
|
|
|
|
+#if defined(CONFIG_PCI) && defined(CONFIG_SYSFS)
|
|
static struct pci_device_id k8_nb_id[] = {
|
|
static struct pci_device_id k8_nb_id[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
|
|
@@ -484,6 +484,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
|
|
return l2;
|
|
return l2;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#ifdef CONFIG_SYSFS
|
|
|
|
+
|
|
/* pointer to _cpuid4_info array (for each cache leaf) */
|
|
/* pointer to _cpuid4_info array (for each cache leaf) */
|
|
static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
|
|
static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
|
|
#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y]))
|
|
#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)
|
|
return retval;
|
|
return retval;
|
|
}
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_SYSFS
|
|
|
|
-
|
|
|
|
#include <linux/kobject.h>
|
|
#include <linux/kobject.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/sysfs.h>
|
|
|
|
|