summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-11 16:37:41 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-11 16:37:41 -0600
commit08b5278650d6e9f61a210f88e3f418c87389df5b (patch)
tree038286d8e677e982643e3388049814c375f59c9c
parent024d4d4c0cf486dee5240183125edbddc6cf2d55 (diff)
parente6a2d72c10405b30ddba5af2e44a9d3d925a56d3 (diff)
downloadlwn-08b5278650d6e9f61a210f88e3f418c87389df5b.tar.gz
lwn-08b5278650d6e9f61a210f88e3f418c87389df5b.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "Just the removal of a redundant call into the sched deadline overrun check" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: posix-cpu-timers: Remove useless call to check_dl_overrun()
-rw-r--r--kernel/time/posix-cpu-timers.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index ce32cf741b25..8f0644af40be 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -917,9 +917,6 @@ static void check_process_timers(struct task_struct *tsk,
struct task_cputime cputime;
unsigned long soft;
- if (dl_task(tsk))
- check_dl_overrun(tsk);
-
/*
* If cputimer is not running, then there are no active
* process wide timers (POSIX 1.b, itimers, RLIMIT_CPU).