diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-11 17:37:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-11 17:37:41 -0500 |
| commit | 08b5278650d6e9f61a210f88e3f418c87389df5b (patch) | |
| tree | 038286d8e677e982643e3388049814c375f59c9c | |
| parent | 024d4d4c0cf486dee5240183125edbddc6cf2d55 (diff) | |
| parent | e6a2d72c10405b30ddba5af2e44a9d3d925a56d3 (diff) | |
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.c | 3 |
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, | |||
| 917 | struct task_cputime cputime; | 917 | struct task_cputime cputime; |
| 918 | unsigned long soft; | 918 | unsigned long soft; |
| 919 | 919 | ||
| 920 | if (dl_task(tsk)) | ||
| 921 | check_dl_overrun(tsk); | ||
| 922 | |||
| 923 | /* | 920 | /* |
| 924 | * If cputimer is not running, then there are no active | 921 | * If cputimer is not running, then there are no active |
| 925 | * process wide timers (POSIX 1.b, itimers, RLIMIT_CPU). | 922 | * process wide timers (POSIX 1.b, itimers, RLIMIT_CPU). |
