summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 17:45:36 +0000
commit429d3efd5669e129a6168d62edb6832e36b7a2a0 (patch)
tree14b99403f823ded018ba76aa450e8687247796b8 /debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch
parentMerging upstream version 5.10.216. (diff)
downloadlinux-429d3efd5669e129a6168d62edb6832e36b7a2a0.tar.xz
linux-429d3efd5669e129a6168d62edb6832e36b7a2a0.zip
Adding debian version 5.10.216-1.debian/5.10.216-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch')
-rw-r--r--debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch b/debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch
index ee24a1117..94d6ec60c 100644
--- a/debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch
+++ b/debian/patches-rt/0117-um-irqstat-Get-rid-of-the-duplicated-declarations.patch
@@ -1,8 +1,8 @@
-From 44cfe18ac1cb81f3617a962640846d232bed6d65 Mon Sep 17 00:00:00 2001
+From 05c6d2c80904407e9d810bb342dd6e833071a819 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 13 Nov 2020 15:02:11 +0100
Subject: [PATCH 117/323] um/irqstat: Get rid of the duplicated declarations
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
irq_cpustat_t and ack_bad_irq() are exactly the same as the asm-generic
ones.
@@ -16,7 +16,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/arch/um/include/asm/hardirq.h b/arch/um/include/asm/hardirq.h
-index b426796d26fd..52e2c36267a9 100644
+index b426796d26fd7..52e2c36267a93 100644
--- a/arch/um/include/asm/hardirq.h
+++ b/arch/um/include/asm/hardirq.h
@@ -2,22 +2,7 @@
@@ -44,5 +44,5 @@ index b426796d26fd..52e2c36267a9 100644
#define __ARCH_IRQ_EXIT_IRQS_DISABLED 1
--
-2.43.0
+2.44.0