summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2020-02-13 14:26:48 +0100
committerRichard Weinberger <richard@nod.at>2020-03-29 23:29:52 +0200
commit0bc8fb4dda2b461491ec567b2333d13897780d8c (patch)
treeced5713f42b176386f212534ecf07822088d3709 /arch/um/kernel
parent88ce642492339f49a0b391af40e5798c08948e49 (diff)
downloadlinux-stable-0bc8fb4dda2b461491ec567b2333d13897780d8c.tar.gz
linux-stable-0bc8fb4dda2b461491ec567b2333d13897780d8c.tar.bz2
linux-stable-0bc8fb4dda2b461491ec567b2333d13897780d8c.zip
um: Implement ndelay/udelay in time-travel mode
In external or inf-cpu time-travel mode, ndelay/udelay currently just waste CPU time since the simulation time doesn't advance. Implement them properly in this case. Note that the "if (time_travel_mode == ...)" parts compile out if CONFIG_UML_TIME_TRAVEL_SUPPORT isn't set, time_travel_mode is defined to TT_MODE_OFF in that case. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/time.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 15c4825b857e..25eaa6a0c658 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -374,6 +374,12 @@ static void time_travel_update_time(unsigned long long next, bool idle)
time_travel_del_event(&ne);
}
+void time_travel_ndelay(unsigned long nsec)
+{
+ time_travel_update_time(time_travel_time + nsec, false);
+}
+EXPORT_SYMBOL(time_travel_ndelay);
+
void time_travel_add_irq_event(struct time_travel_event *e)
{
BUG_ON(time_travel_mode != TT_MODE_EXTERNAL);