diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f87fa49ccf30bff4c8edce8bc6e2fd8003a640f4..41e0cfd6cf378c17052ad32c5103a0e7a22e8ad1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -89,7 +89,7 @@ choice config ARCH_GIC_V2 bool "GIC Version 2" help - This GIC(General Interrupt Controller) version 2 driver is compatatble with + This GIC(General Interrupt Controller) version 2 driver is compatible with GIC version 1 and version 2. config ARCH_GIC_V3 diff --git a/arch/arm/arm/include/los_atomic.h b/arch/arm/arm/include/los_atomic.h index 6d79cf94c88f3651c7f58c275cee3c97d4b7b5ca..63c5c5af10f43cacc6cd73158c41cb25029fc875 100644 --- a/arch/arm/arm/include/los_atomic.h +++ b/arch/arm/arm/include/los_atomic.h @@ -104,7 +104,7 @@ STATIC INLINE VOID LOS_AtomicSet(Atomic *v, INT32 setVal) * @attention * * @@ -385,7 +385,7 @@ STATIC INLINE VOID LOS_Atomic64Set(Atomic64 *v, INT64 setVal) * @attention * * diff --git a/arch/arm/arm/src/los_hw_exc.S b/arch/arm/arm/src/los_hw_exc.S index 1880546253c16d872ab352170539c3b102ee92f3..83dfba5c074b21a5b3f19c54480a8be10090133d 100644 --- a/arch/arm/arm/src/los_hw_exc.S +++ b/arch/arm/arm/src/los_hw_exc.S @@ -48,7 +48,7 @@ #endif #endif .extern OsSaveSignalContext - .extern OsRestorSignalContext + .extern OsRestoreSignalContext .extern OsArmSharedPageFault .extern OsArmA32SyscallHandle @@ -204,7 +204,7 @@ _osExceptSwiHdl: CMP R7, #119 @ __NR_sigreturn BNE _osIsSyscall MOV R0, SP - BLX OsRestorSignalContext + BLX OsRestoreSignalContext MOV SP, R0 B _osSyscallReturn diff --git a/arch/arm/arm/src/startup/reset_vector_mp.S b/arch/arm/arm/src/startup/reset_vector_mp.S index 11c74afcf1b8a691d3d5157942ec64dcc9202494..715e1bfdc9fafc0979bdd841e7f09877df1846f1 100644 --- a/arch/arm/arm/src/startup/reset_vector_mp.S +++ b/arch/arm/arm/src/startup/reset_vector_mp.S @@ -274,7 +274,7 @@ mmu_setup: mcr p15, 0, r12, c2, c0, 0 /* Set attributes and set temp page table */ isb mov r12, #0x7 /* 0b0111 */ - mcr p15, 0, r12, c3, c0, 0 /* Set DACR with 0b0111, client and manager domian */ + mcr p15, 0, r12, c3, c0, 0 /* Set DACR with 0b0111, client and manager domain */ isb mrc p15, 0, r12, c1, c0, 1 /* ACTLR, Auxiliary Control Register */ orr r12, r12, #(1 << 6) /* SMP, Enables coherent requests to the processor. */ diff --git a/arch/arm/arm/src/startup/reset_vector_up.S b/arch/arm/arm/src/startup/reset_vector_up.S index a54f468aea6460958ad8ac29f9ccf5578d101f0f..a740728f101ba54d3e10f30389dda02196441e5e 100644 --- a/arch/arm/arm/src/startup/reset_vector_up.S +++ b/arch/arm/arm/src/startup/reset_vector_up.S @@ -266,7 +266,7 @@ mmu_setup: isb mov r12, #0x7 /* 0b0111 */ - mcr p15, 0, r12, c3, c0, 0 /* Set DACR with 0b0111, client and manager domian */ + mcr p15, 0, r12, c3, c0, 0 /* Set DACR with 0b0111, client and manager domain */ isb mrc p15, 0, r12, c1, c0, 0 diff --git a/kernel/extended/perf/los_perf.c b/kernel/extended/perf/los_perf.c index ecb2644c55da11ee3e66c3f7df4d44e8d0aae3ed..06d338765bc0a51bf08992bd30a2cbd3dc3ba79e 100644 --- a/kernel/extended/perf/los_perf.c +++ b/kernel/extended/perf/los_perf.c @@ -174,7 +174,7 @@ STATIC VOID OsPerfStop(VOID) return; } - if (g_perfCb.pmuStatusPerCpu[cpuid] != PERF_PMU_STOPED) { + if (g_perfCb.pmuStatusPerCpu[cpuid] != PERF_PMU_STOPPED) { UINT32 ret = g_pmu->stop(); if (ret != LOS_OK) { PRINT_ERR("perf stop on core:%u failed, ret = 0x%x\n", cpuid, ret); @@ -185,7 +185,7 @@ STATIC VOID OsPerfStop(VOID) OsPerfPrintCount(); } - g_perfCb.pmuStatusPerCpu[cpuid] = PERF_PMU_STOPED; + g_perfCb.pmuStatusPerCpu[cpuid] = PERF_PMU_STOPPED; } else { PRINT_ERR("percpu status err %d\n", g_perfCb.pmuStatusPerCpu[cpuid]); } diff --git a/kernel/extended/perf/los_perf_pri.h b/kernel/extended/perf/los_perf_pri.h index a57bd81f97da0b40d473f8abb837c438f6187433..bb458c275900a1ea65b7c9fb441f7421f34796b2 100644 --- a/kernel/extended/perf/los_perf_pri.h +++ b/kernel/extended/perf/los_perf_pri.h @@ -51,7 +51,7 @@ extern "C" { #define SMP_CALL_PERF_FUNC(func) OsMpFuncCall(OS_MP_CPU_ALL, (SMP_FUNC_CALL)func, NULL) enum PmuStatus { - PERF_PMU_STOPED, + PERF_PMU_STOPPED, PERF_PMU_STARTED, }; diff --git a/kernel/extended/trace/los_trace.c b/kernel/extended/trace/los_trace.c index 7ece45168777e1475abacfab8c35678f0185794f..cf82862ae71a19f50c90f28fd2420d68880ae54f 100644 --- a/kernel/extended/trace/los_trace.c +++ b/kernel/extended/trace/los_trace.c @@ -306,7 +306,7 @@ UINT32 LOS_TraceStart(VOID) } if (g_traceState == TRACE_UNINIT) { - TRACE_ERROR("trace not inited, be sure LOS_TraceInit excute success\n"); + TRACE_ERROR("trace not inited, be sure LOS_TraceInit execute success\n"); ret = LOS_ERRNO_TRACE_ERROR_STATUS; goto START_END; } @@ -362,7 +362,7 @@ OfflineHead *LOS_TraceRecordGet(VOID) VOID LOS_TraceReset(VOID) { if (g_traceState == TRACE_UNINIT) { - TRACE_ERROR("trace not inited, be sure LOS_TraceInit excute success\n"); + TRACE_ERROR("trace not inited, be sure LOS_TraceInit execute success\n"); return; } diff --git a/kernel/include/los_trace.h b/kernel/include/los_trace.h index 3d9652c99f145b98e8f5aefdb5ed81b1069b8099..eda56c88474419451088890124cf2c907a438582 100644 --- a/kernel/include/los_trace.h +++ b/kernel/include/los_trace.h @@ -110,7 +110,7 @@ enum TraceState { TRACE_UNINIT = 0, /**< trace isn't inited */ TRACE_INITED, /**< trace is inited but not started yet */ TRACE_STARTED, /**< trace is started and system is tracing */ - TRACE_STOPED, /**< trace is stopped */ + TRACE_STOPPED, /**< trace is stopped */ }; /**