aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kernel/sched_clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/sched_clock.c b/arch/arm/kernel/sched_clock.c
index 45efe86e8b08..a781c59b93c0 100644
--- a/arch/arm/kernel/sched_clock.c
+++ b/arch/arm/kernel/sched_clock.c
@@ -55,9 +55,6 @@ static unsigned long long notrace cyc_to_sched_clock(u32 cyc, u32 mask)
55 u64 epoch_ns; 55 u64 epoch_ns;
56 u32 epoch_cyc; 56 u32 epoch_cyc;
57 57
58 if (cd.suspended)
59 return cd.epoch_ns;
60
61 /* 58 /*
62 * Load the epoch_cyc and epoch_ns atomically. We do this by 59 * Load the epoch_cyc and epoch_ns atomically. We do this by
63 * ensuring that we always write epoch_cyc, epoch_ns and 60 * ensuring that we always write epoch_cyc, epoch_ns and
@@ -174,6 +171,9 @@ unsigned long long __read_mostly (*sched_clock_func)(void) = sched_clock_32;
174 171
175unsigned long long notrace sched_clock(void) 172unsigned long long notrace sched_clock(void)
176{ 173{
174 if (cd.suspended)
175 return cd.epoch_ns;
176
177 return sched_clock_func(); 177 return sched_clock_func();
178} 178}
179 179