diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-04 16:40:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-04 16:40:32 +0100 |
| commit | 724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7 (patch) | |
| tree | 6cc08145262424ad6c8179457ed188656c41015f /kernel/time/hrtimer.c | |
| parent | da31de35cd2fb78f75788873e0b61e56d4bb1a90 (diff) | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
| download | linux-next-724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7.tar.gz linux-next-724ec7c190c1893ea55fd7143e7e1c8c5b61a0e7.zip | |
Merge 5.10-rc2 into tty-next
We need the tty/vt/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 3624b9b5835d..387b4bef7dd1 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -425,11 +425,6 @@ static inline void debug_hrtimer_deactivate(struct hrtimer *timer) debug_object_deactivate(timer, &hrtimer_debug_descr); } -static inline void debug_hrtimer_free(struct hrtimer *timer) -{ - debug_object_free(timer, &hrtimer_debug_descr); -} - static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, enum hrtimer_mode mode); |