summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch b/debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch
index a7b949523..82ad4558e 100644
--- a/debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch
+++ b/debian/patches-rt/0118-ARM-irqstat-Get-rid-of-duplicated-declaration.patch
@@ -1,8 +1,8 @@
-From 903c27e244a901b4c66dc1d423a6d9b3214fd868 Mon Sep 17 00:00:00 2001
+From 5d086c5aeabc034a4ff425cbabda8f56f2f1795f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 13 Nov 2020 15:02:12 +0100
Subject: [PATCH 118/323] ARM: irqstat: Get rid of duplicated declaration
-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 is exactly the same as the asm-generic one. Define
ack_bad_irq so the generic header does not emit the generic version of it.
@@ -18,7 +18,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h
-index b95848ed2bc7..706efafbf972 100644
+index b95848ed2bc7f..706efafbf9722 100644
--- a/arch/arm/include/asm/hardirq.h
+++ b/arch/arm/include/asm/hardirq.h
@@ -2,16 +2,11 @@
@@ -42,7 +42,7 @@ index b95848ed2bc7..706efafbf972 100644
#endif /* __ASM_HARDIRQ_H */
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
-index 46d41140df27..1cbcc462b07e 100644
+index 46d41140df27d..1cbcc462b07e8 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -31,6 +31,8 @@ void handle_IRQ(unsigned int, struct pt_regs *);
@@ -55,5 +55,5 @@ index 46d41140df27..1cbcc462b07e 100644
bool exclude_self);
#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace
--
-2.43.0
+2.44.0