From f8b03b519aaff1dec4faf89d69c73ed757ab6660 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 20 Nov 2020 21:08:51 +0100 Subject: [PATCH] UPSTREAM: um: Fix time-travel mode Since the time-travel rework, basic time-travel mode hasn't worked properly, but there's no longer a need for this WARN_ON() so just remove it and thereby fix things. Bug: 176213565 Cc: stable@vger.kernel.org Fixes: 4b786e24ca80 ("um: time-travel: Rewrite as an event scheduler") Signed-off-by: Johannes Berg Signed-off-by: Richard Weinberger (cherry picked from commit ff9632d2a66512436d616ef4c380a0e73f748db1) Signed-off-by: Greg Kroah-Hartman Change-Id: Iea83a52a7dff6514df64cbd35a71e6b2c186450d --- arch/um/kernel/time.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 3d109ff3309b..8dafc3f2add4 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -260,11 +260,6 @@ static void __time_travel_add_event(struct time_travel_event *e, struct time_travel_event *tmp; bool inserted = false; - if (WARN(time_travel_mode == TT_MODE_BASIC && - e != &time_travel_timer_event, - "only timer events can be handled in basic mode")) - return; - if (e->pending) return;