aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-31 00:54:07 -0400
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2010-06-01 10:23:15 -0400
commit4382e90cf851fc1d209a466bab92e256aeb7acf1 (patch)
tree8020c84205c04f93c1e8e2ae1a7ea6a8310771a7
parent8bf9de45b663e4b9ce889eb24929ce773f306339 (diff)
Make C-EDF depend on x86 and SYSFS
C-EDF depends on intel_cacheinfo.c (for get_shared_cpu_map()) which is only available on x86 architectures. Furthermore, get_shared_cpu_map() is only available if SYSFS filesystem is present.
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--litmus/Kconfig1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 91d323f47364..48426f991475 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -173,8 +173,10 @@ extern void print_cpu_info(struct cpuinfo_x86 *);
173extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c); 173extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
174extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); 174extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
175extern unsigned short num_cache_leaves; 175extern unsigned short num_cache_leaves;
176#ifdef CONFIG_SYSFS
176extern int get_shared_cpu_map(cpumask_var_t mask, 177extern int get_shared_cpu_map(cpumask_var_t mask,
177 unsigned int cpu, int index); 178 unsigned int cpu, int index);
179#endif
178 180
179extern void detect_extended_topology(struct cpuinfo_x86 *c); 181extern void detect_extended_topology(struct cpuinfo_x86 *c);
180extern void detect_ht(struct cpuinfo_x86 *c); 182extern void detect_ht(struct cpuinfo_x86 *c);
diff --git a/litmus/Kconfig b/litmus/Kconfig
index ba2e2d901888..c7cbedd1d83d 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -4,6 +4,7 @@ menu "Scheduling"
4 4
5config PLUGIN_CEDF 5config PLUGIN_CEDF
6 bool "Clustered-EDF" 6 bool "Clustered-EDF"
7 depends on X86 && SYSFS
7 default y 8 default y
8 help 9 help
9 Include the Clustered EDF (C-EDF) plugin in the kernel. 10 Include the Clustered EDF (C-EDF) plugin in the kernel.