diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip | |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch')
| -rw-r--r-- | debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch b/debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch index 838a13489..932a66e2d 100644 --- a/debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch +++ b/debian/patches-rt/0129-irqtime-Move-irqtime-entry-accounting-after-irq-offs.patch @@ -1,9 +1,9 @@ -From e387d228099075ac3f762ccfbbe29f9ee59678c8 Mon Sep 17 00:00:00 2001 +From 3da34cd95f146e3ad379e9a1e0c29dbaef4ddd8d Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <frederic@kernel.org> Date: Wed, 2 Dec 2020 12:57:31 +0100 Subject: [PATCH 129/323] irqtime: Move irqtime entry accounting after irq offset incrementation -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 time entry is currently accounted before HARDIRQ_OFFSET or SOFTIRQ_OFFSET are incremented. This is convenient to decide to which @@ -31,7 +31,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h -index c35b71f8644a..0926e9ca4d85 100644 +index c35b71f8644aa..0926e9ca4d85f 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h @@ -32,9 +32,9 @@ static __always_inline void rcu_irq_enter_check_tick(void) @@ -56,7 +56,7 @@ index c35b71f8644a..0926e9ca4d85 100644 } while (0) diff --git a/include/linux/vtime.h b/include/linux/vtime.h -index 6c9867419615..041d6524d144 100644 +index 6c98674196159..041d6524d144a 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -83,32 +83,46 @@ static inline void vtime_init_idle(struct task_struct *tsk, int cpu) { } @@ -117,7 +117,7 @@ index 6c9867419615..041d6524d144 100644 #endif /* _LINUX_KERNEL_VTIME_H */ diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c -index 60129af16ed6..02a7932c7383 100644 +index 60129af16ed69..02a7932c73838 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -44,12 +44,13 @@ static void irqtime_account_delta(struct irqtime *irqtime, u64 delta, @@ -174,7 +174,7 @@ index 60129af16ed6..02a7932c7383 100644 } else if (!IS_ENABLED(CONFIG_HAVE_VIRT_CPU_ACCOUNTING_IDLE) && is_idle_task(tsk)) { diff --git a/kernel/softirq.c b/kernel/softirq.c -index 617009ccd82c..b8f42b3ba8ca 100644 +index 617009ccd82ce..b8f42b3ba8ca1 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -315,10 +315,10 @@ asmlinkage __visible void __softirq_entry __do_softirq(void) @@ -209,5 +209,5 @@ index 617009ccd82c..b8f42b3ba8ca 100644 if (!in_interrupt() && local_softirq_pending()) invoke_softirq(); -- -2.43.0 +2.44.0 |