diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:50:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:50:56 +0100 |
| commit | 986fb2e0532b1b0fa1e8312fbc38b9e7ed826547 (patch) | |
| tree | e571ff6c8cd4bedfd49181125f0bd2993546ed24 /kernel/time/posix-cpu-timers.c | |
| parent | uio: uio_fsl_elbc_gpcm: simplify getting .driver_data (diff) | |
| parent | Linux 4.20-rc4 (diff) | |
| download | linux-986fb2e0532b1b0fa1e8312fbc38b9e7ed826547.tar.xz linux-986fb2e0532b1b0fa1e8312fbc38b9e7ed826547.zip | |
Merge 4.20-rc4 into char-misc-next
We want the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/time/posix-cpu-timers.c')
| -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, 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). |