First commit.

1 files changed, 18 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 0bf12644aa73..482e068a236a 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1215,6 +1215,23 @@ static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
         .notifier_call = cacheinfo_cpu_callback,
 };
 
+#include <litmus/color.h>
+
+extern struct color_cache_info color_cache_info;
+
+static void set_color_vars(void)
+{
+        struct _cpuid4_info *leaf = CPUID4_INFO_IDX(
+                        smp_processor_id(), num_cache_leaves - 1);
+        color_cache_info.size = leaf->size;
+        color_cache_info.line_size =
+                (unsigned long)leaf->ebx.split.coherency_line_size + 1;
+        color_cache_info.ways =
+                (unsigned long)leaf->ebx.split.ways_of_associativity + 1;
+        color_cache_info.sets =
+                (unsigned long)leaf->ecx.split.number_of_sets + 1;
+}
+
 static int __cpuinit cache_sysfs_init(void)
 {
         int i;
@@ -1231,6 +1248,7 @@ static int __cpuinit cache_sysfs_init(void)
                         return err;
         }
         register_hotcpu_notifier(&cacheinfo_cpu_notifier);
+        set_color_vars();
         return 0;
 }