summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 10:10:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 10:12:40 +0000
commitfbc787c3fed74f9a310515aed1d2d274e2a5e14e (patch)
tree02199b213dd11f90381f5cca4a0ace4b3cb45e39 /debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
parentMerging upstream version 6.1.82. (diff)
downloadlinux-fbc787c3fed74f9a310515aed1d2d274e2a5e14e.tar.xz
linux-fbc787c3fed74f9a310515aed1d2d274e2a5e14e.zip
Merging debian version 6.1.82-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch')
-rw-r--r--debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch b/debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
index 6b725886f..404775df6 100644
--- a/debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
+++ b/debian/patches-rt/0007-bpf-Remove-the-obsolte-u64_stats_fetch_-_irq-users.patch
@@ -1,8 +1,8 @@
-From b8cff7d0320e3b39f098d9562373e1c16c54c46c Mon Sep 17 00:00:00 2001
+From a21ab7737a503f49b04e501dbb2b15e4b336c1bc Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 25 Aug 2022 16:17:57 +0200
-Subject: [PATCH 07/62] bpf: Remove the obsolte u64_stats_fetch_*_irq() users.
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.69-rt21.tar.xz
+Subject: [PATCH 07/64] bpf: Remove the obsolte u64_stats_fetch_*_irq() users.
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.82-rt27.tar.xz
Now that the 32bit UP oddity is gone and 32bit uses always a sequence
count, there is no need for the fetch_irq() variants anymore.
@@ -29,10 +29,10 @@ Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 0c8b7733573e..c0915e2424f1 100644
+index 1e46a84694b8..f467e53e09ab 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
-@@ -2115,11 +2115,11 @@ static void bpf_prog_get_stats(const struct bpf_prog *prog,
+@@ -2143,11 +2143,11 @@ static void bpf_prog_get_stats(const struct bpf_prog *prog,
st = per_cpu_ptr(prog->stats, cpu);
do {
@@ -47,5 +47,5 @@ index 0c8b7733573e..c0915e2424f1 100644
cnt += tcnt;
misses += tmisses;
--
-2.43.0
+2.44.0