summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch b/debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch
index 59cbda0e0..d7bdc43ed 100644
--- a/debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch
+++ b/debian/patches-rt/0115-sh-Get-rid-of-nmi_count.patch
@@ -1,8 +1,8 @@
-From 4d4b0ae9c82f34e6cc445f9b04248ae49346a73e Mon Sep 17 00:00:00 2001
+From 5b959c12903041cd3900cfdd30965120d6fb3560 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 13 Nov 2020 15:02:09 +0100
Subject: [PATCH 115/323] sh: Get rid of nmi_count()
-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
nmi_count() is a historical leftover and SH is the only user. Replace it
with regular per cpu accessors.
@@ -17,7 +17,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
-index 5717c7cbdd97..5addcb2c2da0 100644
+index 5717c7cbdd97a..5addcb2c2da0c 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -44,7 +44,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
@@ -30,7 +30,7 @@ index 5717c7cbdd97..5addcb2c2da0 100644
seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
-index 4efffc18c851..be15e41489b2 100644
+index 4efffc18c8512..be15e41489b2d 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -186,7 +186,7 @@ BUILD_TRAP_HANDLER(nmi)
@@ -43,5 +43,5 @@ index 4efffc18c851..be15e41489b2 100644
switch (notify_die(DIE_NMI, "NMI", regs, 0, vec & 0xff, SIGINT)) {
case NOTIFY_OK:
--
-2.43.0
+2.44.0