From e12055cfcc2284bdc9358caafba8847e8314eec3 Mon Sep 17 00:00:00 2001
From: zhushengle <star_rain@tom.com>
Date: Wed, 20 Jan 2021 11:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCPUP=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cpup/los_cpup.c | 6 +++---
 kernel/src/los_init.c      | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/cpup/los_cpup.c b/components/cpup/los_cpup.c
index 74151b22..94fa4d7e 100644
--- a/components/cpup/los_cpup.c
+++ b/components/cpup/los_cpup.c
@@ -32,7 +32,9 @@
 #include "los_cpup.h"
 #include "securec.h"
 #include "los_memory.h"
+#include "los_timer.h"
 #include "los_debug.h"
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
@@ -60,13 +62,11 @@ LITE_OS_SEC_BSS OsCpupCB  *g_cpup = NULL;
 LITE_OS_SEC_BSS UINT64    g_lastRecordTime;
 LITE_OS_SEC_BSS UINT16    g_hisPos; /* <current Sampling point of historyTime */
 
-
-extern VOID LOS_GetCpuCycle(UINT32 *cntHi, UINT32 *cntLo);
 LITE_OS_SEC_TEXT_MINOR STATIC INLINE UINT64 OsGetCurrentCyclesCount(VOID)
 {
     UINT32 high = 0;
     UINT32 low = 0;
-    LOS_GetCpuCycle(&high, &low);
+    HalGetCpuCycle(&high, &low);
     return (((UINT64)high << 32) + low); // 32 means bits of word
 }
 
diff --git a/kernel/src/los_init.c b/kernel/src/los_init.c
index d5d145db..204b8f25 100644
--- a/kernel/src/los_init.c
+++ b/kernel/src/los_init.c
@@ -50,6 +50,9 @@
 #include "los_swtmr.h"
 #endif
 
+#if (LOSCFG_BASE_CORE_CPUP == 1)
+#include "los_cpup.h"
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -132,7 +135,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
     }
 
 #if (LOSCFG_BASE_CORE_TSK_MONITOR == 1)
-        OsTaskMonInit();
+    OsTaskMonInit();
 #endif
 
 #if (LOSCFG_BASE_CORE_CPUP == 1)