aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/intel_cacheinfo.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-18 15:24:45 -0400
committerIngo Molnar <mingo@elte.hu>2009-02-26 16:39:12 -0500
commitba1d755a36f66101aa88ac9ebb54694def6ec38d (patch)
tree66618e721678bf656c6847b4b97072d5d1656ffe /arch/x86/kernel/cpu/intel_cacheinfo.c
parentbd0838fc48c174cd386447059a414318e78169e1 (diff)
fix warning in arch/x86/kernel/cpu/intel_cacheinfo.c
fix this warning: arch/x86/kernel/cpu/intel_cacheinfo.c:139: warning: ‘k8_nb_id’ defined but not used arch/x86/kernel/cpu/intel_cacheinfo.c:527: warning: ‘free_cache_attributes’ defined but not used arch/x86/kernel/cpu/intel_cacheinfo.c:538: warning: ‘detect_cache_attributes’ defined but not used Unused variables in the !CONFIG_SYSCTL case. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/intel_cacheinfo.c')
-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