Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / x86 / events / intel / rapl.c

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 91039ffed63334828717ac4647d2c353d95a39ab..94dc564146ca89190cc203d2b78e6651b4742f19 100644 (file)
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -397,13 +397,7 @@ static int rapl_pmu_event_init(struct perf_event *event)
                return -EINVAL;
 
        /* unsupported modes and filters */
-       if (event->attr.exclude_user   ||
-           event->attr.exclude_kernel ||
-           event->attr.exclude_hv     ||
-           event->attr.exclude_idle   ||
-           event->attr.exclude_host   ||
-           event->attr.exclude_guest  ||
-           event->attr.sample_period) /* no sampling */
+       if (event->attr.sample_period) /* no sampling */
                return -EINVAL;
 
        /* must be done before validate_group */
@@ -699,6 +693,7 @@ static int __init init_rapl_pmus(void)
        rapl_pmus->pmu.stop             = rapl_pmu_event_stop;
        rapl_pmus->pmu.read             = rapl_pmu_event_read;
        rapl_pmus->pmu.module           = THIS_MODULE;
+       rapl_pmus->pmu.capabilities     = PERF_PMU_CAP_NO_EXCLUDE;
        return 0;
 }