diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 16:36:11 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 16:36:11 +0300 |
| commit | 0698461ad2984892a47582a58eb235488d3aac7f (patch) | |
| tree | 107cfefee20b50f79cde3ed847f075bdbf50fad0 /arch/arm/mach-exynos/exynos.c | |
| parent | 0d2997f750d1de394231bc22768dab94a5b5db2f (diff) | |
| parent | ff6992735ade75aae3e35d16b17da1008d753d28 (diff) | |
| download | linux-0698461ad2984892a47582a58eb235488d3aac7f.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To update the perf/core codebase.
Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end
of evsel__config(), after what was added in:
49c692b7dfc9b6c0 ("perf offcpu: Accept allowed sample types only")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/mach-exynos/exynos.c')
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 8b48326be9fd..51a247ca4da8 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -149,6 +149,7 @@ static void exynos_map_pmu(void) np = of_find_matching_node(NULL, exynos_dt_pmu_match); if (np) pmu_base_addr = of_iomap(np, 0); + of_node_put(np); } static void __init exynos_init_irq(void) |