summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch b/debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch
index e4a67c29c..766ad3309 100644
--- a/debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch
+++ b/debian/patches-rt/0127-s390-vtime-Use-the-generic-IRQ-entry-accounting.patch
@@ -1,8 +1,8 @@
-From 433f928a0fd33d67682020e134ac00885b38a2a9 Mon Sep 17 00:00:00 2001
+From 78bd952658e1aa01f1321864062df18b87e29562 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <frederic@kernel.org>
Date: Wed, 2 Dec 2020 12:57:29 +0100
Subject: [PATCH 127/323] s390/vtime: Use the generic IRQ entry accounting
-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
s390 has its own version of IRQ entry accounting because it doesn't
account the idle time the same way the other architectures do. Only
@@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
-index 240277d5626c..628e1e7fe302 100644
+index 240277d5626c8..628e1e7fe3029 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -646,6 +646,12 @@ config HAVE_TIF_NOHZ
@@ -53,7 +53,7 @@ index 240277d5626c..628e1e7fe302 100644
bool
help
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
-index 878993982e39..2e78071551e7 100644
+index 878993982e39d..2e78071551e7a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -183,6 +183,7 @@ config S390
@@ -65,7 +65,7 @@ index 878993982e39..2e78071551e7 100644
select IOMMU_SUPPORT if PCI
select MODULES_USE_ELF_RELA
diff --git a/arch/s390/include/asm/vtime.h b/arch/s390/include/asm/vtime.h
-index 3622d4ebc73a..fac6a67988eb 100644
+index 3622d4ebc73aa..fac6a67988eb5 100644
--- a/arch/s390/include/asm/vtime.h
+++ b/arch/s390/include/asm/vtime.h
@@ -2,7 +2,6 @@
@@ -77,7 +77,7 @@ index 3622d4ebc73a..fac6a67988eb 100644
#endif /* _S390_VTIME_H */
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
-index 710135905deb..18a97631af43 100644
+index eb98d145db9a6..f4956d7403b3f 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -248,10 +248,6 @@ void vtime_account_kernel(struct task_struct *tsk)
@@ -92,7 +92,7 @@ index 710135905deb..18a97631af43 100644
* Sorted add to a list. List is linear searched until first bigger
* element is found.
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
-index e03568c5f584..1d78b835ec8b 100644
+index e03568c5f5842..1d78b835ec8b4 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -417,23 +417,14 @@ void vtime_task_switch(struct task_struct *prev)
@@ -122,5 +122,5 @@ index e03568c5f584..1d78b835ec8b 100644
void cputime_adjust(struct task_cputime *curr, struct prev_cputime *prev,
u64 *ut, u64 *st)
--
-2.43.0
+2.44.0