Merge branch 'linus' into auto-latest

diff --cc arch/arm/kernel/perf_event.c
index ff17b17b668eeed1c5930748a3c480e623c13298,c475379199b1d149adc4f8e33e00f1d544e4b595..8e9c98edc0682a8aa23790737a3b63b08dea847f
--- 1/arch/arm/kernel/perf_event.c
--- 2/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@@ -343,11 -343,17 +343,17 @@@ validate_group(struct perf_event *event
  {
        struct perf_event *sibling, *leader = event->group_leader;
        struct pmu_hw_events fake_pmu;
+       DECLARE_BITMAP(fake_used_mask, ARMPMU_MAX_HWEVENTS);
  
-       memset(&fake_pmu, 0, sizeof(fake_pmu));
+       /*
+        * Initialise the fake PMU. We only need to populate the
+        * used_mask for the purposes of validation.
+        */
+       memset(fake_used_mask, 0, sizeof(fake_used_mask));
+       fake_pmu.used_mask = fake_used_mask;
  
        if (!validate_event(&fake_pmu, leader))
 -              return -ENOSPC;
 +              return -EINVAL;
  
        list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
                if (!validate_event(&fake_pmu, sibling))

diff --cc include/linux/init_task.h
Simple merge