]> git.baikalelectronics.ru Git - kernel.git/commit
um: fix time travel mode
authorJohannes Berg <johannes.berg@intel.com>
Mon, 22 Jul 2019 07:12:56 +0000 (09:12 +0200)
committerRichard Weinberger <richard@nod.at>
Thu, 22 Aug 2019 22:39:53 +0000 (00:39 +0200)
commit11f5a557edc5835e7948cd9a8601ee7129e5dcfa
tree01628bcac02fd84399a5008bcdf40615f326a187
parent75eaf80f84ebc7588c50189fc3b72bcd0f66e5fc
um: fix time travel mode

Unfortunately, my build fix for when time travel mode isn't
enabled broke time travel mode, because I forgot that we need
to use the timer time after the timer has been marked disabled,
and thus need to leave the time stored instead of zeroing it.

Fix that by splitting the inline into two, so we can call only
the _mode() one in the relevant code path.

Fixes: f6950455509a ("um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/include/shared/timer-internal.h
arch/um/kernel/process.c
arch/um/kernel/time.c