diff --git a/arch/arm/src/armv7-r/sctlr.h b/arch/arm/src/armv7-r/sctlr.h index 98db4980af5..bdc2b77c128 100644 --- a/arch/arm/src/armv7-r/sctlr.h +++ b/arch/arm/src/armv7-r/sctlr.h @@ -526,7 +526,7 @@ static inline void cp15_wractlr(unsigned int actlr) /* Read/write the Performance Monitor Control Register (PMCR) */ -static inline unsigned int cp15_rdpmcr(void) +static inline unsigned int cp15_pmu_rdpmcr(void) { unsigned int pmcr; __asm__ __volatile__ @@ -540,7 +540,7 @@ static inline unsigned int cp15_rdpmcr(void) return pmcr; } -static inline void cp15_wrpmcr(unsigned int pmcr) +static inline void cp15_pmu_wrpmcr(unsigned int pmcr) { __asm__ __volatile__ ( diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c index dfdadd8dd7c..363a3a6c5dc 100644 --- a/arch/arm/src/tms570/tms570_boot.c +++ b/arch/arm/src/tms570/tms570_boot.c @@ -104,9 +104,9 @@ static inline void tms570_event_export(void) { - uint32_t pmcr = cp15_rdpmcr(); + uint32_t pmcr = cp15_pmu_rdpmcr(); pmcr |= PCMR_X; - cp15_wrpmcr(pmcr); + cp15_pmu_wrpmcr(pmcr); } /****************************************************************************