Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix

[linux.git] / arch / x86 / kernel / cpu / intel_rdt_rdtgroup.c

diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index b140c68bc14ba81b35406d835190428772c91836..643670fb8943486471b773a43d0f57579e7cd5d8 100644 (file)
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -2805,6 +2805,13 @@ static int rdtgroup_show_options(struct seq_file *seq, struct kernfs_root *kf)
 {
        if (rdt_resources_all[RDT_RESOURCE_L3DATA].alloc_enabled)
                seq_puts(seq, ",cdp");
+
+       if (rdt_resources_all[RDT_RESOURCE_L2DATA].alloc_enabled)
+               seq_puts(seq, ",cdpl2");
+
+       if (is_mba_sc(&rdt_resources_all[RDT_RESOURCE_MBA]))
+               seq_puts(seq, ",mba_MBps");
+
        return 0;
 }