38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From c7bb69d07655a229ad8ef92b216062c4d3bc11c2 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <c7bb69d07655a229ad8ef92b216062c4d3bc11c2.1596234183.git.zanussi@kernel.org>
|
|
In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Tue, 8 Jan 2019 12:31:06 +0100
|
|
Subject: [PATCH 101/329] sched/fair: Make the hrtimers non-hard again
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz
|
|
|
|
Since commit "sched/fair: Robustify CFS-bandwidth timer locking" both
|
|
hrtimer can run in softirq context because now interrupts are disabled
|
|
as part of the locking procedure.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/sched/fair.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
|
|
index 661b5d6d4197..80289617ce3d 100644
|
|
--- a/kernel/sched/fair.c
|
|
+++ b/kernel/sched/fair.c
|
|
@@ -4951,9 +4951,9 @@ void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b)
|
|
cfs_b->period = ns_to_ktime(default_cfs_period());
|
|
|
|
INIT_LIST_HEAD(&cfs_b->throttled_cfs_rq);
|
|
- hrtimer_init(&cfs_b->period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);
|
|
+ hrtimer_init(&cfs_b->period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
|
|
cfs_b->period_timer.function = sched_cfs_period_timer;
|
|
- hrtimer_init(&cfs_b->slack_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
|
|
+ hrtimer_init(&cfs_b->slack_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
|
cfs_b->slack_timer.function = sched_cfs_slack_timer;
|
|
cfs_b->distribute_running = 0;
|
|
}
|
|
--
|
|
2.17.1
|
|
|