summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-02-21 10:16:59 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-23 14:29:03 +0000
commit82312b2fc1c5f4375eb3a8828592d4d1a5f02e17 (patch)
tree69accbfd9fb41a99b428e384676e5c6217f231ed /meta/recipes-kernel
parentc59d5700247008e17d56d369ff0583d14b4f8225 (diff)
downloadpoky-82312b2fc1c5f4375eb3a8828592d4d1a5f02e17.tar.gz
linux-yocto: Remove unused patch
This patch remained after bumping from 6.1 to 6.6 (From OE-Core rev: 3083c9cc3c117b6284fee6926da2200cef509e6f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/files/0001-perf-cpumap-Make-counter-as-unsigned-ints.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/meta/recipes-kernel/linux/files/0001-perf-cpumap-Make-counter-as-unsigned-ints.patch b/meta/recipes-kernel/linux/files/0001-perf-cpumap-Make-counter-as-unsigned-ints.patch
deleted file mode 100644
index 2bfc40fe04..0000000000
--- a/meta/recipes-kernel/linux/files/0001-perf-cpumap-Make-counter-as-unsigned-ints.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From d14450f9e0f05ea7177c5404a7a9289352caab77 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 23 Jan 2023 13:04:10 -0800
4Subject: [PATCH] perf cpumap: Make counter as unsigned ints
5
6These are loop counters which is inherently unsigned. Therefore make
7them unsigned. Moreover it also fixes alloc-size-larger-than
8error with gcc-13, where malloc can be called with (-1) due to tmp_len
9being an int type.
10
11Fixes
12| cpumap.c:366:20: error: argument 1 range [18446744065119617024, 18446744073709551612] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=]
13| 366 | tmp_cpus = malloc(tmp_len * sizeof(struct perf_cpu));
14| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Cc: Peter Zijlstra <peterz@infradead.org>
18Cc: Ingo Molnar <mingo@redhat.com>
19Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
20Cc: Mark Rutland <mark.rutland@arm.com>
21Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
22Cc: Jiri Olsa <jolsa@kernel.org>
23Cc: Namhyung Kim <namhyung@kernel.org>
24
25Upstream-Status: Submitted [https://lore.kernel.org/linux-perf-users/20230123211310.127532-1-raj.khem@gmail.com/T/#u]
26---
27 tools/lib/perf/cpumap.c | 10 +++++-----
28 1 file changed, 5 insertions(+), 5 deletions(-)
29
30diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c
31index 6cd0be7c1bb4..d960880dd903 100644
32--- a/tools/lib/perf/cpumap.c
33+++ b/tools/lib/perf/cpumap.c
34@@ -351,8 +351,8 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
35 struct perf_cpu_map *other)
36 {
37 struct perf_cpu *tmp_cpus;
38- int tmp_len;
39- int i, j, k;
40+ unsigned int tmp_len;
41+ unsigned int i, j, k;
42 struct perf_cpu_map *merged;
43
44 if (perf_cpu_map__is_subset(orig, other))
45@@ -369,7 +369,7 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
46
47 /* Standard merge algorithm from wikipedia */
48 i = j = k = 0;
49- while (i < orig->nr && j < other->nr) {
50+ while (i < (unsigned int)orig->nr && j < (unsigned int)other->nr) {
51 if (orig->map[i].cpu <= other->map[j].cpu) {
52 if (orig->map[i].cpu == other->map[j].cpu)
53 j++;
54@@ -378,10 +378,10 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
55 tmp_cpus[k++] = other->map[j++];
56 }
57
58- while (i < orig->nr)
59+ while (i < (unsigned int)orig->nr)
60 tmp_cpus[k++] = orig->map[i++];
61
62- while (j < other->nr)
63+ while (j < (unsigned int)other->nr)
64 tmp_cpus[k++] = other->map[j++];
65 assert(k <= tmp_len);
66
67--
682.39.1
69