Index: kernel/arch/arm32/include/arch/asm.h
===================================================================
--- kernel/arch/arm32/include/arch/asm.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/asm.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -56,5 +56,5 @@
  * only for armv6+.
  */
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a
@@ -65,30 +65,30 @@
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
 	*port = v;
 }
 
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
 	*port = v;
 }
 
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
 	*port = v;
 }
 
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
 	return *port;
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
 	return *port;
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
 	return *port;
@@ -102,5 +102,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t v;
Index: kernel/arch/arm32/include/arch/cycle.h
===================================================================
--- kernel/arch/arm32/include/arch/cycle.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -47,5 +47,5 @@
  *
  */
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a
Index: kernel/arch/arm32/include/arch/istate.h
===================================================================
--- kernel/arch/arm32/include/arch/istate.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/istate.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -55,5 +55,5 @@
  *
  */
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     uintptr_t retaddr)
 {
@@ -62,5 +62,5 @@
 
 /** Return true if exception happened while in userspace. */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
 	return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE;
@@ -68,10 +68,10 @@
 
 /** Return Program Counter member of given istate structure. */
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
 {
 	return istate->pc;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
 	return istate->fp;
Index: kernel/arch/arm32/include/arch/mm/page.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -151,5 +151,5 @@
  * set_pt_level1_flags (kernel/arch/arm32/include/arch/mm/page_armv6.h)
  */
-NO_TRACE static inline void set_ptl0_addr(pte_t *pt)
+_NO_TRACE static inline void set_ptl0_addr(pte_t *pt)
 {
 	uint32_t val = (uint32_t)pt & TTBR_ADDR_MASK;
@@ -161,5 +161,5 @@
 }
 
-NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address)
+_NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address)
 {
 	pt[i].l0.coarse_table_addr = address >> 10;
@@ -167,5 +167,5 @@
 }
 
-NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address)
+_NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address)
 {
 	pt[i].l1.frame_base_addr = address >> 12;
Index: kernel/arch/arm32/include/arch/mm/page_armv4.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -137,5 +137,5 @@
  *
  */
-NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
 {
 	pte_level0_t *p = &pt[i].l0;
@@ -153,5 +153,5 @@
  *
  */
-NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
 {
 	pte_level1_t *p = &pt[i].l1;
@@ -178,5 +178,5 @@
  *
  */
-NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_level0_t *p = &pt[i].l0;
@@ -206,5 +206,5 @@
  *
  */
-NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_level1_t *p = &pt[i].l1;
@@ -236,5 +236,5 @@
 }
 
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
 {
 	pte_level0_t *p = &pt[i].l0;
@@ -245,5 +245,5 @@
 }
 
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
 {
 	pte_level1_t *p = &pt[i].l1;
Index: kernel/arch/arm32/include/arch/mm/page_armv6.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 336b7393ec3e072439a0e045724088e669be87d4)
+++ kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -164,5 +164,5 @@
  *
  */
-NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
 {
 	const pte_level0_t *p = &pt[i].l0;
@@ -180,5 +180,5 @@
  *
  */
-NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
 {
 	const pte_level1_t *p = &pt[i].l1;
@@ -206,5 +206,5 @@
  *
  */
-NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_level0_t *p = &pt[i].l0;
@@ -239,5 +239,5 @@
  *
  */
-NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_level1_t *p = &pt[i].l1;
@@ -297,5 +297,5 @@
 }
 
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
 {
 	pte_level0_t *p = &pt[i].l0;
@@ -307,5 +307,5 @@
 }
 
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
 {
 	pte_level1_t *p = &pt[i].l1;