diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:36 +0000 |
| commit | 429d3efd5669e129a6168d62edb6832e36b7a2a0 (patch) | |
| tree | 14b99403f823ded018ba76aa450e8687247796b8 /debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-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/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch')
| -rw-r--r-- | debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch b/debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch index bb1e03d33..2ec448a91 100644 --- a/debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch +++ b/debian/patches-rt/0128-sched-vtime-Consolidate-IRQ-time-accounting.patch @@ -1,8 +1,8 @@ -From 749e0a8d4b10240d5834e135f34c47d107aa1442 Mon Sep 17 00:00:00 2001 +From 56fb869479a267eba4536630604a67340aedbcbf Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <frederic@kernel.org> Date: Wed, 2 Dec 2020 12:57:30 +0100 Subject: [PATCH 128/323] sched/vtime: Consolidate IRQ time 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 The 3 architectures implementing CONFIG_VIRT_CPU_ACCOUNTING_NATIVE all have their own version of irq time accounting that dispatch the @@ -26,7 +26,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 5 files changed, 102 insertions(+), 48 deletions(-) diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c -index 7abc5f37bfaf..733e0e3324b8 100644 +index 7abc5f37bfaf9..733e0e3324b80 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -138,12 +138,8 @@ void vtime_account_kernel(struct task_struct *tsk) @@ -65,7 +65,7 @@ index 7abc5f37bfaf..733e0e3324b8 100644 static irqreturn_t diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c -index ba9b54d35f57..588e081ca55b 100644 +index ba9b54d35f570..588e081ca55b5 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -312,12 +312,11 @@ static unsigned long vtime_delta_scaled(struct cpu_accounting_data *acct, @@ -163,11 +163,11 @@ index ba9b54d35f57..588e081ca55b 100644 struct cpu_accounting_data *acct) { diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c -index 18a97631af43..9b3c5978b668 100644 +index f4956d7403b3f..667880f5f8972 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -223,31 +223,50 @@ void vtime_flush(struct task_struct *tsk) - S390_lowcore.avg_steal_timer = avg_steal; + S390_lowcore.avg_steal_timer = avg_steal / 2; } +static u64 vtime_delta(void) @@ -231,7 +231,7 @@ index 18a97631af43..9b3c5978b668 100644 * Sorted add to a list. List is linear searched until first bigger * element is found. diff --git a/include/linux/vtime.h b/include/linux/vtime.h -index 2cdeca062db3..6c9867419615 100644 +index 2cdeca062db32..6c98674196159 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -83,16 +83,12 @@ static inline void vtime_init_idle(struct task_struct *tsk, int cpu) { } @@ -272,7 +272,7 @@ index 2cdeca062db3..6c9867419615 100644 } diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c -index 1d78b835ec8b..60129af16ed6 100644 +index 1d78b835ec8b4..60129af16ed69 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -417,13 +417,18 @@ void vtime_task_switch(struct task_struct *prev) @@ -299,5 +299,5 @@ index 1d78b835ec8b..60129af16ed6 100644 void cputime_adjust(struct task_cputime *curr, struct prev_cputime *prev, -- -2.43.0 +2.44.0 |