Skip to content

Commit

Permalink
UPSTREAM: um: Fix time-travel mode
Browse files Browse the repository at this point in the history
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: 4b786e2 ("um: time-travel: Rewrite as an event scheduler")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
(cherry picked from commit ff9632d)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iea83a52a7dff6514df64cbd35a71e6b2c186450d
  • Loading branch information
jmberg-intel authored and gregkh committed Jan 14, 2021
1 parent b4b0c57 commit f8b03b5
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions arch/um/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit f8b03b5

Please sign in to comment.