diff --git a/sched/clock/clock.h b/sched/clock/clock.h
index dee8d848ee7..a59ce4a8627 100644
--- a/sched/clock/clock.h
+++ b/sched/clock/clock.h
@@ -78,12 +78,6 @@ void clock_increase_sched_ticks(clock_t ticks);
 
 clock_t clock_get_sched_ticks(void);
 
-/****************************************************************************
- * perf_init
- ****************************************************************************/
-
-void perf_init(void);
-
 #ifdef CONFIG_SCHED_CPULOAD_SYSCLK
 void cpuload_init(void);
 #endif
diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c
index 6305ac0536e..4a6bdff743a 100644
--- a/sched/clock/clock_initialize.c
+++ b/sched/clock/clock_initialize.c
@@ -227,8 +227,6 @@ void clock_initialize(void)
   clock_inittime(NULL);
 #endif
 
-  perf_init();
-
 #ifdef CONFIG_SCHED_CPULOAD_SYSCLK
   cpuload_init();
 #endif
diff --git a/sched/clock/clock_perf.c b/sched/clock/clock_perf.c
index 646e84fcb2a..1ca3cfc5082 100644
--- a/sched/clock/clock_perf.c
+++ b/sched/clock/clock_perf.c
@@ -42,7 +42,7 @@ struct perf_s
   struct wdog_s wdog;
   spinlock_t lock;
   unsigned long last;
-  unsigned long overflow;
+  clock_t overflow;
   clock_t timeout;
 };
 
@@ -62,33 +62,16 @@ static struct perf_s g_perf;
 
 static void perf_update(wdparm_t arg)
 {
-  FAR struct perf_s *perf = &g_perf;
+  FAR struct perf_s *perf = (FAR struct perf_s *)arg;
 
   perf_gettime();
-  wd_start_next((FAR struct wdog_s *)arg, perf->timeout, perf_update, arg);
+  wd_start_next(&perf->wdog, perf->timeout, perf_update, arg);
 }
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * perf_init
- ****************************************************************************/
-
-void perf_init(void)
-{
-  FAR struct perf_s *perf = &g_perf;
-
-  perf->timeout = (((clock_t)1 << (CONFIG_ARCH_PERF_COUNT_BITWIDTH - 1)) - 1)
-                  * TICK_PER_SEC / up_perf_getfreq();
-  perf->last = up_perf_gettime();
-
-  /* Periodic check for overflow */
-
-  wd_start(&perf->wdog, perf->timeout, perf_update, (wdparm_t)perf);
-}
-
 /****************************************************************************
  * perf_gettime
  ****************************************************************************/
@@ -100,16 +83,23 @@ clock_t perf_gettime(void)
   clock_t now = up_perf_gettime();
   clock_t result;
 
-  /* Check if overflow */
+  if (perf->timeout == 0)
+    {
+      perf->timeout =
+        ((clock_t)1 << (CONFIG_ARCH_PERF_COUNT_BITWIDTH - 1)) *
+        TICK_PER_SEC / up_perf_getfreq();
 
-  if (now < perf->last)
+      /* Periodic check for overflow */
+
+      wd_start(&perf->wdog, perf->timeout, perf_update, (wdparm_t)perf);
+    }
+  else if (now < perf->last)
     {
       perf->overflow++;
     }
 
   perf->last = now;
-  result = (clock_t)now | \
-           (clock_t)perf->overflow << CONFIG_ARCH_PERF_COUNT_BITWIDTH;
+  result = now | (perf->overflow << CONFIG_ARCH_PERF_COUNT_BITWIDTH);
   spin_unlock_irqrestore(&perf->lock, flags);
   return result;
 }
@@ -139,14 +129,6 @@ unsigned long perf_getfreq(void)
 #elif defined(CONFIG_ALARM_ARCH) || defined (CONFIG_TIMER_ARCH) || \
       defined(CONFIG_ARCH_PERF_EVENTS)
 
-/****************************************************************************
- * perf_init
- ****************************************************************************/
-
-void perf_init(void)
-{
-}
-
 /****************************************************************************
  * perf_gettime
  ****************************************************************************/
@@ -176,14 +158,6 @@ unsigned long perf_getfreq(void)
 
 #else
 
-/****************************************************************************
- * perf_init
- ****************************************************************************/
-
-void perf_init(void)
-{
-}
-
 /****************************************************************************
  * perf_gettime
  ****************************************************************************/