From 379aaaab11a8b616f34628464a60dca78fb3e257 Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Wed, 21 Nov 2012 15:28:01 +0100 Subject: [PATCH] ARM/libroot: small workaround for crash The whole system_time support will have to be revisited anyhow, since the only base we have for timing is SoC specific, not ARM core specific :( --- src/system/libroot/os/arch/arm/system_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system/libroot/os/arch/arm/system_time.c b/src/system/libroot/os/arch/arm/system_time.c index 6514ae92e4..bef6175a18 100644 --- a/src/system/libroot/os/arch/arm/system_time.c +++ b/src/system/libroot/os/arch/arm/system_time.c @@ -35,6 +35,6 @@ system_time(void) { uint64 timeBase = __arm_get_time_base(); - uint32 cv = *sConversionFactor; + uint32 cv = sConversionFactor ? *sConversionFactor : 0; return (timeBase >> 32) * cv + (((timeBase & 0xffffffff) * cv) >> 32); }