From 624d37bab61d1912fe484f12017edcf06d73e107 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Wed, 11 Dec 2019 15:08:12 -0700 Subject: [PATCH 1/2] msm: kgsl: Check the return value of sysfs functions Do a WARN_ON check for sysfs_create_file and sysfs_create_bin_file to avoid a compiler warning. Fixes: 41b90d7 ("msm: kgsl: Remove a few unused device tree properties") Change-Id: Ic0dedbadede06484faf0dde107a6cde08b89a40a Signed-off-by: Jordan Crouse --- drivers/gpu/msm/kgsl_snapshot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/msm/kgsl_snapshot.c b/drivers/gpu/msm/kgsl_snapshot.c index 77faab94563f..6659a47fe690 100644 --- a/drivers/gpu/msm/kgsl_snapshot.c +++ b/drivers/gpu/msm/kgsl_snapshot.c @@ -1130,8 +1130,8 @@ void kgsl_device_snapshot_probe(struct kgsl_device *device, u32 size) &device->dev->kobj, "snapshot")) return; - sysfs_create_bin_file(&device->snapshot_kobj, &snapshot_attr); - sysfs_create_files(&device->snapshot_kobj, snapshot_attrs); + WARN_ON(sysfs_create_bin_file(&device->snapshot_kobj, &snapshot_attr)); + WARN_ON(sysfs_create_files(&device->snapshot_kobj, snapshot_attrs)); } /** From 2090d9398570d042dfaed324c4a2e3d54cbeccf0 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Fri, 6 Dec 2019 16:20:54 -0700 Subject: [PATCH 2/2] Revert "perf: Set the DSU PMU to be readable from any CPU" This reverts commit 45826d76e1b5114e873db1ac9eb540f831ba3644. This depends on f994cb4 ("perf/core: Add support for PMUs that can be read from more than 1 CPU") from the msm-4.19 kernel but that hasn't been ported yet. Change-Id: Ic0dedbad915849397583a48562c6ec9b5c88c738 Signed-off-by: Jordan Crouse --- drivers/perf/arm_dsu_pmu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c index c4b282dcb5f8..70968c8c09d7 100644 --- a/drivers/perf/arm_dsu_pmu.c +++ b/drivers/perf/arm_dsu_pmu.c @@ -582,7 +582,6 @@ static int dsu_pmu_event_init(struct perf_event *event) return -EINVAL; event->hw.config_base = event->attr.config; - event->readable_on_cpus = CPU_MASK_ALL; return 0; }