Index: kernel/arch/abs32le/include/arch/asm.h
===================================================================
--- kernel/arch/abs32le/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/abs32le/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -40,9 +40,9 @@
 #include <trace.h>
 
-NO_TRACE static inline void asm_delay_loop(uint32_t usec)
-{
-}
-
-NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
+_NO_TRACE static inline void asm_delay_loop(uint32_t usec)
+{
+}
+
+_NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
 {
 	/*
@@ -57,5 +57,5 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 	/*
@@ -67,5 +67,5 @@
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
 }
@@ -79,5 +79,5 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
 }
@@ -91,5 +91,5 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
 }
@@ -103,5 +103,5 @@
  *
  */
-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 0;
@@ -116,5 +116,5 @@
  *
  */
-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 0;
@@ -129,10 +129,10 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
-{
-	return 0;
-}
-
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+{
+	return 0;
+}
+
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	/*
@@ -146,5 +146,5 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	/*
@@ -160,5 +160,5 @@
 }
 
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	/*
@@ -168,5 +168,5 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	/*
@@ -178,5 +178,5 @@
 }
 
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	/*
@@ -188,5 +188,5 @@
 }
 
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	/*
Index: kernel/arch/abs32le/include/arch/cycle.h
===================================================================
--- kernel/arch/abs32le/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/abs32le/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	return 0;
Index: kernel/arch/abs32le/include/arch/istate.h
===================================================================
--- kernel/arch/abs32le/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/abs32le/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -62,5 +62,5 @@
 } istate_t;
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {
@@ -73,5 +73,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)
     WRITES(&istate->ip)
@@ -82,5 +82,5 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {
@@ -90,5 +90,5 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {
Index: kernel/arch/abs32le/include/arch/mm/page.h
===================================================================
--- kernel/arch/abs32le/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/abs32le/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -147,5 +147,5 @@
 } __attribute__((packed)) pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
@@ -161,5 +161,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
     WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
@@ -180,5 +180,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
     WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
Index: kernel/arch/amd64/include/arch/asm.h
===================================================================
--- kernel/arch/amd64/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/amd64/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -50,5 +50,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t v;
@@ -63,5 +63,5 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 	asm volatile (
@@ -70,5 +70,5 @@
 }
 
-NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void)
+_NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void)
 {
 	while (true) {
@@ -87,5 +87,5 @@
  *
  */
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -111,5 +111,5 @@
  *
  */
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -135,5 +135,5 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -159,5 +159,5 @@
  *
  */
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -178,5 +178,5 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -197,5 +197,5 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -208,5 +208,5 @@
 }
 
-NO_TRACE static inline uint64_t read_rflags(void)
+_NO_TRACE static inline uint64_t read_rflags(void)
 {
 	uint64_t rflags;
@@ -221,5 +221,5 @@
 }
 
-NO_TRACE static inline void write_rflags(uint64_t rflags)
+_NO_TRACE static inline void write_rflags(uint64_t rflags)
 {
 	asm volatile (
@@ -237,5 +237,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	return (ipl_t) read_rflags();
@@ -249,5 +249,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	ipl_t ipl = interrupts_read();
@@ -265,5 +265,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	ipl_t ipl = interrupts_read();
@@ -281,5 +281,5 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	write_rflags((uint64_t) ipl);
@@ -291,5 +291,5 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	return ((read_rflags() & RFLAGS_IF) == 0);
@@ -297,5 +297,5 @@
 
 /** Write to MSR */
-NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
+_NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
 {
 	asm volatile (
@@ -307,5 +307,5 @@
 }
 
-NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
+_NO_TRACE static inline sysarg_t read_msr(uint32_t msr)
 {
 	uint32_t ax, dx;
@@ -325,5 +325,5 @@
  *
  */
-NO_TRACE static inline void invlpg(uintptr_t addr)
+_NO_TRACE static inline void invlpg(uintptr_t addr)
 {
 	asm volatile (
@@ -338,5 +338,5 @@
  *
  */
-NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg)
 {
 	asm volatile (
@@ -351,5 +351,5 @@
  *
  */
-NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg)
 {
 	asm volatile (
@@ -364,5 +364,5 @@
  *
  */
-NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg)
+_NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg)
 {
 	asm volatile (
@@ -376,5 +376,5 @@
  *
  */
-NO_TRACE static inline void tr_load(uint16_t sel)
+_NO_TRACE static inline void tr_load(uint16_t sel)
 {
 	asm volatile (
@@ -384,5 +384,5 @@
 }
 
-#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
+#define GEN_READ_REG(reg) _NO_TRACE static inline sysarg_t read_ ##reg (void) \
 	{ \
 		sysarg_t res; \
@@ -394,5 +394,5 @@
 	}
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
+#define GEN_WRITE_REG(reg) _NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
 	{ \
 		asm volatile ( \
Index: kernel/arch/amd64/include/arch/cycle.h
===================================================================
--- kernel/arch/amd64/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/amd64/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	uint32_t lower;
Index: kernel/arch/amd64/include/arch/istate.h
===================================================================
--- kernel/arch/amd64/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/amd64/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -47,10 +47,10 @@
 
 /** 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->cs & RPL_USER) == RPL_USER;
 }
 
-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)
 {
@@ -58,10 +58,10 @@
 }
 
-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->rip;
 }
 
-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->rbp;
Index: kernel/arch/amd64/include/arch/mm/page.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/amd64/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -207,5 +207,5 @@
 } __attribute__((packed)) pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
@@ -220,5 +220,5 @@
 }
 
-NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
+_NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a)
 {
 	pte_t *p = &pt[i];
@@ -228,5 +228,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *p = &pt[i];
@@ -245,5 +245,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
Index: kernel/arch/arm32/include/arch/asm.h
===================================================================
--- kernel/arch/arm32/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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 d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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 d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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 d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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 d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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 d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -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;
Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia32/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -48,5 +48,5 @@
  *
  */
-NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
+_NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
 {
 	while (true) {
@@ -57,5 +57,5 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 	asm volatile (
@@ -64,5 +64,5 @@
 }
 
-#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \
+#define GEN_READ_REG(reg) _NO_TRACE static inline sysarg_t read_ ##reg (void) \
 	{ \
 		sysarg_t res; \
@@ -74,5 +74,5 @@
 	}
 
-#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
+#define GEN_WRITE_REG(reg) _NO_TRACE static inline void write_ ##reg (sysarg_t regn) \
 	{ \
 		asm volatile ( \
@@ -113,5 +113,5 @@
  *
  */
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
@@ -132,5 +132,5 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
@@ -151,5 +151,5 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
@@ -170,5 +170,5 @@
  *
  */
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
@@ -194,5 +194,5 @@
  *
  */
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
@@ -218,5 +218,5 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
@@ -234,5 +234,5 @@
 }
 
-NO_TRACE static inline uint32_t read_eflags(void)
+_NO_TRACE static inline uint32_t read_eflags(void)
 {
 	uint32_t eflags;
@@ -247,5 +247,5 @@
 }
 
-NO_TRACE static inline void write_eflags(uint32_t eflags)
+_NO_TRACE static inline void write_eflags(uint32_t eflags)
 {
 	asm volatile (
@@ -261,5 +261,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	return (ipl_t) read_eflags();
@@ -273,5 +273,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	ipl_t ipl = interrupts_read();
@@ -289,5 +289,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	ipl_t ipl = interrupts_read();
@@ -305,5 +305,5 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	write_eflags((uint32_t) ipl);
@@ -315,5 +315,5 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	return ((read_eflags() & EFLAGS_IF) == 0);
@@ -323,5 +323,5 @@
 
 /** Write to MSR */
-NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
+_NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
 {
 	asm volatile (
@@ -333,5 +333,5 @@
 }
 
-NO_TRACE static inline uint64_t read_msr(uint32_t msr)
+_NO_TRACE static inline uint64_t read_msr(uint32_t msr)
 {
 	uint32_t ax, dx;
@@ -356,5 +356,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t v;
@@ -374,5 +374,5 @@
  *
  */
-NO_TRACE static inline void invlpg(uintptr_t addr)
+_NO_TRACE static inline void invlpg(uintptr_t addr)
 {
 	asm volatile (
@@ -387,5 +387,5 @@
  *
  */
-NO_TRACE static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_load(ptr_16_32_t *gdtr_reg)
 {
 	asm volatile (
@@ -400,5 +400,5 @@
  *
  */
-NO_TRACE static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
+_NO_TRACE static inline void gdtr_store(ptr_16_32_t *gdtr_reg)
 {
 	asm volatile (
@@ -413,5 +413,5 @@
  *
  */
-NO_TRACE static inline void idtr_load(ptr_16_32_t *idtr_reg)
+_NO_TRACE static inline void idtr_load(ptr_16_32_t *idtr_reg)
 {
 	asm volatile (
@@ -426,5 +426,5 @@
  *
  */
-NO_TRACE static inline void tr_load(uint16_t sel)
+_NO_TRACE static inline void tr_load(uint16_t sel)
 {
 	asm volatile (
@@ -439,5 +439,5 @@
  *
  */
-NO_TRACE static inline void gs_load(uint16_t sel)
+_NO_TRACE static inline void gs_load(uint16_t sel)
 {
 	asm volatile (
Index: kernel/arch/ia32/include/arch/cycle.h
===================================================================
--- kernel/arch/ia32/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia32/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 #ifdef PROCESSOR_i486
Index: kernel/arch/ia32/include/arch/istate.h
===================================================================
--- kernel/arch/ia32/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia32/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -47,10 +47,10 @@
 
 /** 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->cs & RPL_USER) == RPL_USER;
 }
 
-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)
 {
@@ -58,10 +58,10 @@
 }
 
-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->eip;
 }
 
-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->ebp;
Index: kernel/arch/ia32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -180,5 +180,5 @@
 } __attribute__((packed)) pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
@@ -193,5 +193,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *p = &pt[i];
@@ -210,5 +210,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
Index: kernel/arch/ia64/include/arch/asm.h
===================================================================
--- kernel/arch/ia64/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia64/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -45,5 +45,5 @@
 
 /** Map the I/O port address to a legacy I/O address. */
-NO_TRACE static inline uintptr_t p2a(volatile void *p)
+_NO_TRACE static inline uintptr_t p2a(volatile void *p)
 {
 	uintptr_t prt = (uintptr_t) p;
@@ -52,5 +52,5 @@
 }
 
-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)
 {
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY)
@@ -66,5 +66,5 @@
 }
 
-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)
 {
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY)
@@ -80,5 +80,5 @@
 }
 
-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)
 {
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY)
@@ -94,5 +94,5 @@
 }
 
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
 	uint8_t v;
@@ -116,5 +116,5 @@
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
 	uint16_t v;
@@ -138,5 +138,5 @@
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
 	uint32_t v;
@@ -166,5 +166,5 @@
  * The memory stack must start on page boundary.
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uint64_t value;
@@ -183,5 +183,5 @@
  *
  */
-NO_TRACE static inline uint64_t psr_read(void)
+_NO_TRACE static inline uint64_t psr_read(void)
 {
 	uint64_t v;
@@ -200,5 +200,5 @@
  *
  */
-NO_TRACE static inline uint64_t iva_read(void)
+_NO_TRACE static inline uint64_t iva_read(void)
 {
 	uint64_t v;
@@ -217,5 +217,5 @@
  *
  */
-NO_TRACE static inline void iva_write(uint64_t v)
+_NO_TRACE static inline void iva_write(uint64_t v)
 {
 	asm volatile (
@@ -231,5 +231,5 @@
  *
  */
-NO_TRACE static inline uint64_t ivr_read(void)
+_NO_TRACE static inline uint64_t ivr_read(void)
 {
 	uint64_t v;
@@ -243,5 +243,5 @@
 }
 
-NO_TRACE static inline uint64_t cr64_read(void)
+_NO_TRACE static inline uint64_t cr64_read(void)
 {
 	uint64_t v;
@@ -260,5 +260,5 @@
  *
  */
-NO_TRACE static inline void itc_write(uint64_t v)
+_NO_TRACE static inline void itc_write(uint64_t v)
 {
 	asm volatile (
@@ -273,5 +273,5 @@
  *
  */
-NO_TRACE static inline uint64_t itc_read(void)
+_NO_TRACE static inline uint64_t itc_read(void)
 {
 	uint64_t v;
@@ -290,5 +290,5 @@
  *
  */
-NO_TRACE static inline void itm_write(uint64_t v)
+_NO_TRACE static inline void itm_write(uint64_t v)
 {
 	asm volatile (
@@ -303,5 +303,5 @@
  *
  */
-NO_TRACE static inline uint64_t itm_read(void)
+_NO_TRACE static inline uint64_t itm_read(void)
 {
 	uint64_t v;
@@ -320,5 +320,5 @@
  *
  */
-NO_TRACE static inline uint64_t itv_read(void)
+_NO_TRACE static inline uint64_t itv_read(void)
 {
 	uint64_t v;
@@ -337,5 +337,5 @@
  *
  */
-NO_TRACE static inline void itv_write(uint64_t v)
+_NO_TRACE static inline void itv_write(uint64_t v)
 {
 	asm volatile (
@@ -350,5 +350,5 @@
  *
  */
-NO_TRACE static inline void eoi_write(uint64_t v)
+_NO_TRACE static inline void eoi_write(uint64_t v)
 {
 	asm volatile (
@@ -363,5 +363,5 @@
  *
  */
-NO_TRACE static inline uint64_t tpr_read(void)
+_NO_TRACE static inline uint64_t tpr_read(void)
 {
 	uint64_t v;
@@ -380,5 +380,5 @@
  *
  */
-NO_TRACE static inline void tpr_write(uint64_t v)
+_NO_TRACE static inline void tpr_write(uint64_t v)
 {
 	asm volatile (
@@ -396,5 +396,5 @@
  *
  */
-NO_TRACE static ipl_t interrupts_disable(void)
+_NO_TRACE static ipl_t interrupts_disable(void)
 {
 	uint64_t v;
@@ -418,5 +418,5 @@
  *
  */
-NO_TRACE static ipl_t interrupts_enable(void)
+_NO_TRACE static ipl_t interrupts_enable(void)
 {
 	uint64_t v;
@@ -441,5 +441,5 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	if (ipl & PSR_I_MASK)
@@ -454,5 +454,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	return (ipl_t) psr_read();
@@ -464,5 +464,5 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	return !(psr_read() & PSR_I_MASK);
@@ -470,5 +470,5 @@
 
 /** Disable protection key checking. */
-NO_TRACE static inline void pk_disable(void)
+_NO_TRACE static inline void pk_disable(void)
 {
 	asm volatile (
Index: kernel/arch/ia64/include/arch/cpu.h
===================================================================
--- kernel/arch/ia64/include/arch/cpu.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia64/include/arch/cpu.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -64,5 +64,5 @@
  *
  */
-NO_TRACE static inline uint64_t cpuid_read(int n)
+_NO_TRACE static inline uint64_t cpuid_read(int n)
 {
 	uint64_t v;
@@ -77,5 +77,5 @@
 }
 
-NO_TRACE static inline int ia64_get_cpu_id(void)
+_NO_TRACE static inline int ia64_get_cpu_id(void)
 {
 	uint64_t cr64 = cr64_read();
@@ -83,5 +83,5 @@
 }
 
-NO_TRACE static inline int ia64_get_cpu_eid(void)
+_NO_TRACE static inline int ia64_get_cpu_eid(void)
 {
 	uint64_t cr64 = cr64_read();
@@ -89,5 +89,5 @@
 }
 
-NO_TRACE static inline void ipi_send_ipi(int id, int eid, int intno)
+_NO_TRACE static inline void ipi_send_ipi(int id, int eid, int intno)
 {
 	(bootinfo->sapic)[2 * (id * 256 + eid)] = intno;
Index: kernel/arch/ia64/include/arch/cycle.h
===================================================================
--- kernel/arch/ia64/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia64/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	return 0;
Index: kernel/arch/ia64/include/arch/istate.h
===================================================================
--- kernel/arch/ia64/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia64/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -50,5 +50,5 @@
 #endif /* KERNEL */
 
-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)
 {
@@ -57,10 +57,10 @@
 }
 
-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->cr_iip;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
 	/* FIXME */
@@ -69,5 +69,5 @@
 }
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
 	return (istate->cr_iip) < 0xe000000000000000ULL;
Index: kernel/arch/ia64/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ia64/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -191,5 +191,5 @@
  * @return Address of the head of VHPT collision chain.
  */
-NO_TRACE static inline uint64_t thash(uint64_t va)
+_NO_TRACE static inline uint64_t thash(uint64_t va)
 {
 	uint64_t ret;
@@ -213,5 +213,5 @@
  * @return The unique tag for VPN and RID in the collision chain returned by thash().
  */
-NO_TRACE static inline uint64_t ttag(uint64_t va)
+_NO_TRACE static inline uint64_t ttag(uint64_t va)
 {
 	uint64_t ret;
@@ -232,5 +232,5 @@
  * @return Current contents of rr[i].
  */
-NO_TRACE static inline uint64_t rr_read(size_t i)
+_NO_TRACE static inline uint64_t rr_read(size_t i)
 {
 	uint64_t ret;
@@ -252,5 +252,5 @@
  * @param v Value to be written to rr[i].
  */
-NO_TRACE static inline void rr_write(size_t i, uint64_t v)
+_NO_TRACE static inline void rr_write(size_t i, uint64_t v)
 {
 	assert(i < REGION_REGISTERS);
@@ -267,5 +267,5 @@
  * @return Current value stored in PTA.
  */
-NO_TRACE static inline uint64_t pta_read(void)
+_NO_TRACE static inline uint64_t pta_read(void)
 {
 	uint64_t ret;
@@ -283,5 +283,5 @@
  * @param v New value to be stored in PTA.
  */
-NO_TRACE static inline void pta_write(uint64_t v)
+_NO_TRACE static inline void pta_write(uint64_t v)
 {
 	asm volatile (
Index: kernel/arch/mips32/include/arch/asm.h
===================================================================
--- kernel/arch/mips32/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/mips32/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -40,5 +40,5 @@
 #include <trace.h>
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 	asm volatile ("wait");
@@ -52,5 +52,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t base;
@@ -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;
Index: kernel/arch/mips32/include/arch/cycle.h
===================================================================
--- kernel/arch/mips32/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/mips32/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -40,5 +40,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read());
Index: kernel/arch/mips32/include/arch/istate.h
===================================================================
--- kernel/arch/mips32/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/mips32/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -50,5 +50,5 @@
 #endif /* KERNEL */
 
-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)
 {
@@ -57,15 +57,15 @@
 
 /** 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->status & cp0_status_um_bit;
 }
 
-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->epc;
 }
 
-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->sp;
Index: kernel/arch/mips32/include/arch/mm/page.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/mips32/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -161,5 +161,5 @@
 } pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
@@ -174,5 +174,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *p = &pt[i];
@@ -189,5 +189,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
 	pte_t *p = &pt[i];
Index: kernel/arch/mips32/include/arch/mm/tlb.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/tlb.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/mips32/include/arch/mm/tlb.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -135,5 +135,5 @@
  * Probe TLB for Matching Entry.
  */
-NO_TRACE static inline void tlbp(void)
+_NO_TRACE static inline void tlbp(void)
 {
 	asm volatile ("tlbp\n\t");
@@ -144,5 +144,5 @@
  * Read Indexed TLB Entry.
  */
-NO_TRACE static inline void tlbr(void)
+_NO_TRACE static inline void tlbr(void)
 {
 	asm volatile ("tlbr\n\t");
@@ -153,5 +153,5 @@
  * Write Indexed TLB Entry.
  */
-NO_TRACE static inline void tlbwi(void)
+_NO_TRACE static inline void tlbwi(void)
 {
 	asm volatile ("tlbwi\n\t");
@@ -162,5 +162,5 @@
  * Write Random TLB Entry.
  */
-NO_TRACE static inline void tlbwr(void)
+_NO_TRACE static inline void tlbwr(void)
 {
 	asm volatile ("tlbwr\n\t");
Index: kernel/arch/ppc32/include/arch/asm.h
===================================================================
--- kernel/arch/ppc32/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -42,5 +42,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint32_t msr_read(void)
+_NO_TRACE static inline uint32_t msr_read(void)
 {
 	uint32_t msr;
@@ -54,5 +54,5 @@
 }
 
-NO_TRACE static inline void msr_write(uint32_t msr)
+_NO_TRACE static inline void msr_write(uint32_t msr)
 {
 	asm volatile (
@@ -63,5 +63,5 @@
 }
 
-NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
+_NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
 {
 	asm volatile (
@@ -74,5 +74,5 @@
 }
 
-NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
+_NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
 {
 	uint32_t vsid;
@@ -87,5 +87,5 @@
 }
 
-NO_TRACE static inline uint32_t sdr1_get(void)
+_NO_TRACE static inline uint32_t sdr1_get(void)
 {
 	uint32_t sdr1;
@@ -107,5 +107,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	ipl_t ipl = msr_read();
@@ -122,5 +122,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	ipl_t ipl = msr_read();
@@ -136,5 +136,5 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	msr_write((msr_read() & (~MSR_EE)) | (ipl & MSR_EE));
@@ -148,5 +148,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	return msr_read();
@@ -158,5 +158,5 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	return ((msr_read() & MSR_EE) == 0);
@@ -170,5 +170,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t base;
@@ -183,34 +183,34 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
-{
-}
-
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+_NO_TRACE static inline void cpu_sleep(void)
+{
+}
+
+_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;
Index: kernel/arch/ppc32/include/arch/cpu.h
===================================================================
--- kernel/arch/ppc32/include/arch/cpu.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/cpu.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -44,5 +44,5 @@
 } __attribute__((packed)) cpu_arch_t;
 
-NO_TRACE static inline void cpu_version(cpu_arch_t *info)
+_NO_TRACE static inline void cpu_version(cpu_arch_t *info)
 {
 	asm volatile (
Index: kernel/arch/ppc32/include/arch/cycle.h
===================================================================
--- kernel/arch/ppc32/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	uint32_t lower;
Index: kernel/arch/ppc32/include/arch/istate.h
===================================================================
--- kernel/arch/ppc32/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -50,5 +50,5 @@
 #endif /* KERNEL */
 
-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)
 {
@@ -61,15 +61,15 @@
  *
  */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
 	return (istate->srr1 & MSR_PR) != 0;
 }
 
-NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
 {
 	return istate->pc;
 }
 
-NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
 {
 	return istate->sp;
Index: kernel/arch/ppc32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/frame.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/mm/frame.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -46,5 +46,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint32_t physmem_top(void)
+_NO_TRACE static inline uint32_t physmem_top(void)
 {
 	uint32_t physmem;
Index: kernel/arch/ppc32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ppc32/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/ppc32/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -162,5 +162,5 @@
 } pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *entry = &pt[i];
@@ -175,5 +175,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *entry = &pt[i];
@@ -185,5 +185,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
 	pte_t *entry = &pt[i];
Index: kernel/arch/riscv64/include/arch/asm.h
===================================================================
--- kernel/arch/riscv64/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/riscv64/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -42,5 +42,5 @@
 #include <trace.h>
 
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	ipl_t ipl;
@@ -54,5 +54,5 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	ipl_t ipl;
@@ -66,5 +66,5 @@
 }
 
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	if ((ipl & SSTATUS_SIE_MASK) == SSTATUS_SIE_MASK)
@@ -74,5 +74,5 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	ipl_t ipl;
@@ -86,10 +86,10 @@
 }
 
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	return ((interrupts_read() & SSTATUS_SIE_MASK) == 0);
 }
 
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t base;
@@ -104,34 +104,34 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 }
 
-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;
Index: kernel/arch/riscv64/include/arch/cycle.h
===================================================================
--- kernel/arch/riscv64/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/riscv64/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -38,5 +38,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	uint64_t cycle;
Index: kernel/arch/riscv64/include/arch/istate.h
===================================================================
--- kernel/arch/riscv64/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/riscv64/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -44,5 +44,5 @@
 #endif
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
 	// FIXME
@@ -50,5 +50,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)
 {
@@ -56,5 +56,5 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
 {
 	// FIXME
@@ -62,5 +62,5 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
 	// FIXME
Index: kernel/arch/riscv64/include/arch/mm/page.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/page.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -179,5 +179,5 @@
 } pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
 	pte_t *entry = &pt[i];
@@ -191,5 +191,5 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
 	pte_t *entry = &pt[i];
@@ -205,5 +205,5 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
 	pte_t *entry = &pt[i];
Index: kernel/arch/sparc64/include/arch/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -44,5 +44,5 @@
 #include <trace.h>
 
-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;
@@ -50,5 +50,5 @@
 }
 
-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;
@@ -56,5 +56,5 @@
 }
 
-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;
@@ -62,5 +62,5 @@
 }
 
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
 	uint8_t rv = *port;
@@ -69,5 +69,5 @@
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
 	uint16_t rv = *port;
@@ -76,5 +76,5 @@
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
 	uint32_t rv = *port;
@@ -88,5 +88,5 @@
  *
  */
-NO_TRACE static inline uint64_t pstate_read(void)
+_NO_TRACE static inline uint64_t pstate_read(void)
 {
 	uint64_t v;
@@ -105,5 +105,5 @@
  *
  */
-NO_TRACE static inline void pstate_write(uint64_t v)
+_NO_TRACE static inline void pstate_write(uint64_t v)
 {
 	asm volatile (
@@ -119,5 +119,5 @@
  *
  */
-NO_TRACE static inline uint64_t tick_compare_read(void)
+_NO_TRACE static inline uint64_t tick_compare_read(void)
 {
 	uint64_t v;
@@ -136,5 +136,5 @@
  *
  */
-NO_TRACE static inline void tick_compare_write(uint64_t v)
+_NO_TRACE static inline void tick_compare_write(uint64_t v)
 {
 	asm volatile (
@@ -150,5 +150,5 @@
  *
  */
-NO_TRACE static inline uint64_t stick_compare_read(void)
+_NO_TRACE static inline uint64_t stick_compare_read(void)
 {
 	uint64_t v;
@@ -167,5 +167,5 @@
  *
  */
-NO_TRACE static inline void stick_compare_write(uint64_t v)
+_NO_TRACE static inline void stick_compare_write(uint64_t v)
 {
 	asm volatile (
@@ -181,5 +181,5 @@
  *
  */
-NO_TRACE static inline uint64_t tick_read(void)
+_NO_TRACE static inline uint64_t tick_read(void)
 {
 	uint64_t v;
@@ -198,5 +198,5 @@
  *
  */
-NO_TRACE static inline void tick_write(uint64_t v)
+_NO_TRACE static inline void tick_write(uint64_t v)
 {
 	asm volatile (
@@ -212,5 +212,5 @@
  *
  */
-NO_TRACE static inline uint64_t fprs_read(void)
+_NO_TRACE static inline uint64_t fprs_read(void)
 {
 	uint64_t v;
@@ -229,5 +229,5 @@
  *
  */
-NO_TRACE static inline void fprs_write(uint64_t v)
+_NO_TRACE static inline void fprs_write(uint64_t v)
 {
 	asm volatile (
@@ -243,5 +243,5 @@
  *
  */
-NO_TRACE static inline uint64_t softint_read(void)
+_NO_TRACE static inline uint64_t softint_read(void)
 {
 	uint64_t v;
@@ -260,5 +260,5 @@
  *
  */
-NO_TRACE static inline void softint_write(uint64_t v)
+_NO_TRACE static inline void softint_write(uint64_t v)
 {
 	asm volatile (
@@ -276,5 +276,5 @@
  *
  */
-NO_TRACE static inline void clear_softint_write(uint64_t v)
+_NO_TRACE static inline void clear_softint_write(uint64_t v)
 {
 	asm volatile (
@@ -292,5 +292,5 @@
  *
  */
-NO_TRACE static inline void set_softint_write(uint64_t v)
+_NO_TRACE static inline void set_softint_write(uint64_t v)
 {
 	asm volatile (
@@ -309,5 +309,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
 	pstate_reg_t pstate;
@@ -329,5 +329,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
 	pstate_reg_t pstate;
@@ -348,5 +348,5 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
 	pstate_reg_t pstate;
@@ -364,5 +364,5 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
 	return (ipl_t) pstate_read();
@@ -374,5 +374,5 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
 	pstate_reg_t pstate;
@@ -389,5 +389,5 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
 	uintptr_t unbiased_sp;
@@ -407,5 +407,5 @@
  *
  */
-NO_TRACE static inline uint64_t ver_read(void)
+_NO_TRACE static inline uint64_t ver_read(void)
 {
 	uint64_t v;
@@ -424,5 +424,5 @@
  *
  */
-NO_TRACE static inline uint64_t tpc_read(void)
+_NO_TRACE static inline uint64_t tpc_read(void)
 {
 	uint64_t v;
@@ -441,5 +441,5 @@
  *
  */
-NO_TRACE static inline uint64_t tl_read(void)
+_NO_TRACE static inline uint64_t tl_read(void)
 {
 	uint64_t v;
@@ -458,5 +458,5 @@
  *
  */
-NO_TRACE static inline uint64_t tba_read(void)
+_NO_TRACE static inline uint64_t tba_read(void)
 {
 	uint64_t v;
@@ -475,5 +475,5 @@
  *
  */
-NO_TRACE static inline void tba_write(uint64_t v)
+_NO_TRACE static inline void tba_write(uint64_t v)
 {
 	asm volatile (
@@ -493,5 +493,5 @@
  *
  */
-NO_TRACE static inline uint64_t asi_u64_read(asi_t asi, uintptr_t va)
+_NO_TRACE static inline uint64_t asi_u64_read(asi_t asi, uintptr_t va)
 {
 	uint64_t v;
@@ -514,5 +514,5 @@
  *
  */
-NO_TRACE static inline void asi_u64_write(asi_t asi, uintptr_t va, uint64_t v)
+_NO_TRACE static inline void asi_u64_write(asi_t asi, uintptr_t va, uint64_t v)
 {
 	asm volatile (
@@ -526,5 +526,5 @@
 
 /** Flush all valid register windows to memory. */
-NO_TRACE static inline void flushw(void)
+_NO_TRACE static inline void flushw(void)
 {
 	asm volatile ("flushw\n");
@@ -532,5 +532,5 @@
 
 /** Switch to nucleus by setting TL to 1. */
-NO_TRACE static inline void nucleus_enter(void)
+_NO_TRACE static inline void nucleus_enter(void)
 {
 	asm volatile ("wrpr %g0, 1, %tl\n");
@@ -538,5 +538,5 @@
 
 /** Switch from nucleus by setting TL to 0. */
-NO_TRACE static inline void nucleus_leave(void)
+_NO_TRACE static inline void nucleus_leave(void)
 {
 	asm volatile ("wrpr %g0, %g0, %tl\n");
Index: kernel/arch/sparc64/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc64/include/arch/barrier.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/barrier.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -39,5 +39,5 @@
 
 /** Flush Instruction pipeline. */
-NO_TRACE static inline void flush_pipeline(void)
+_NO_TRACE static inline void flush_pipeline(void)
 {
 	unsigned long pc;
@@ -62,5 +62,5 @@
 
 /** Memory Barrier instruction. */
-NO_TRACE static inline void membar(void)
+_NO_TRACE static inline void membar(void)
 {
 	asm volatile (
Index: kernel/arch/sparc64/include/arch/cycle.h
===================================================================
--- kernel/arch/sparc64/include/arch/cycle.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/cycle.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -39,5 +39,5 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 	return tick_read();
Index: kernel/arch/sparc64/include/arch/istate.h
===================================================================
--- kernel/arch/sparc64/include/arch/istate.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/istate.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -51,5 +51,5 @@
 #endif /* KERNEL */
 
-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)
 {
@@ -57,15 +57,15 @@
 }
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
 	return !(istate->tstate & TSTATE_PRIV_BIT);
 }
 
-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->tpc;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
 	/* TODO */
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -243,5 +243,5 @@
  * Determine the number of entries in the DMMU's small TLB.
  */
-NO_TRACE static inline uint16_t tlb_dsmall_size(void)
+_NO_TRACE static inline uint16_t tlb_dsmall_size(void)
 {
 	return 16;
@@ -251,5 +251,5 @@
  * Determine the number of entries in each DMMU's big TLB.
  */
-NO_TRACE static inline uint16_t tlb_dbig_size(void)
+_NO_TRACE static inline uint16_t tlb_dbig_size(void)
 {
 	return 512;
@@ -259,5 +259,5 @@
  * Determine the number of entries in the IMMU's small TLB.
  */
-NO_TRACE static inline uint16_t tlb_ismall_size(void)
+_NO_TRACE static inline uint16_t tlb_ismall_size(void)
 {
 	return 16;
@@ -267,5 +267,5 @@
  * Determine the number of entries in the IMMU's big TLB.
  */
-NO_TRACE static inline uint16_t tlb_ibig_size(void)
+_NO_TRACE static inline uint16_t tlb_ibig_size(void)
 {
 	if (((ver_reg_t) ver_read()).impl == IMPL_ULTRASPARCIV_PLUS)
@@ -281,5 +281,5 @@
  * @return		Current value of Primary Context Register.
  */
-NO_TRACE static inline uint64_t mmu_primary_context_read(void)
+_NO_TRACE static inline uint64_t mmu_primary_context_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_PRIMARY_CONTEXT_REG);
@@ -290,5 +290,5 @@
  * @param v		New value of Primary Context Register.
  */
-NO_TRACE static inline void mmu_primary_context_write(uint64_t v)
+_NO_TRACE static inline void mmu_primary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_PRIMARY_CONTEXT_REG, v);
@@ -300,5 +300,5 @@
  * @return		Current value of Secondary Context Register.
  */
-NO_TRACE static inline uint64_t mmu_secondary_context_read(void)
+_NO_TRACE static inline uint64_t mmu_secondary_context_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_SECONDARY_CONTEXT_REG);
@@ -309,5 +309,5 @@
  * @param v		New value of Primary Context Register.
  */
-NO_TRACE static inline void mmu_secondary_context_write(uint64_t v)
+_NO_TRACE static inline void mmu_secondary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_SECONDARY_CONTEXT_REG, v);
@@ -324,5 +324,5 @@
  * 			Register.
  */
-NO_TRACE static inline uint64_t itlb_data_access_read(size_t entry)
+_NO_TRACE static inline uint64_t itlb_data_access_read(size_t entry)
 {
 	itlb_data_access_addr_t reg;
@@ -338,5 +338,5 @@
  * @param value		Value to be written.
  */
-NO_TRACE static inline void itlb_data_access_write(size_t entry, uint64_t value)
+_NO_TRACE static inline void itlb_data_access_write(size_t entry, uint64_t value)
 {
 	itlb_data_access_addr_t reg;
@@ -355,5 +355,5 @@
  * 			Register.
  */
-NO_TRACE static inline uint64_t dtlb_data_access_read(size_t entry)
+_NO_TRACE static inline uint64_t dtlb_data_access_read(size_t entry)
 {
 	dtlb_data_access_addr_t reg;
@@ -369,5 +369,5 @@
  * @param value		Value to be written.
  */
-NO_TRACE static inline void dtlb_data_access_write(size_t entry, uint64_t value)
+_NO_TRACE static inline void dtlb_data_access_write(size_t entry, uint64_t value)
 {
 	dtlb_data_access_addr_t reg;
@@ -385,5 +385,5 @@
  * @return		Current value of specified IMMU TLB Tag Read Register.
  */
-NO_TRACE static inline uint64_t itlb_tag_read_read(size_t entry)
+_NO_TRACE static inline uint64_t itlb_tag_read_read(size_t entry)
 {
 	itlb_tag_read_addr_t tag;
@@ -400,5 +400,5 @@
  * @return		Current value of specified DMMU TLB Tag Read Register.
  */
-NO_TRACE static inline uint64_t dtlb_tag_read_read(size_t entry)
+_NO_TRACE static inline uint64_t dtlb_tag_read_read(size_t entry)
 {
 	dtlb_tag_read_addr_t tag;
@@ -419,5 +419,5 @@
  * 			Register.
  */
-NO_TRACE static inline uint64_t itlb_data_access_read(int tlb, size_t entry)
+_NO_TRACE static inline uint64_t itlb_data_access_read(int tlb, size_t entry)
 {
 	itlb_data_access_addr_t reg;
@@ -434,5 +434,5 @@
  * @param value		Value to be written.
  */
-NO_TRACE static inline void itlb_data_access_write(int tlb, size_t entry,
+_NO_TRACE static inline void itlb_data_access_write(int tlb, size_t entry,
     uint64_t value)
 {
@@ -454,5 +454,5 @@
  * 			Register.
  */
-NO_TRACE static inline uint64_t dtlb_data_access_read(int tlb, size_t entry)
+_NO_TRACE static inline uint64_t dtlb_data_access_read(int tlb, size_t entry)
 {
 	dtlb_data_access_addr_t reg;
@@ -470,5 +470,5 @@
  * @param value		Value to be written.
  */
-NO_TRACE static inline void dtlb_data_access_write(int tlb, size_t entry,
+_NO_TRACE static inline void dtlb_data_access_write(int tlb, size_t entry,
     uint64_t value)
 {
@@ -489,5 +489,5 @@
  * @return		Current value of specified IMMU TLB Tag Read Register.
  */
-NO_TRACE static inline uint64_t itlb_tag_read_read(int tlb, size_t entry)
+_NO_TRACE static inline uint64_t itlb_tag_read_read(int tlb, size_t entry)
 {
 	itlb_tag_read_addr_t tag;
@@ -506,5 +506,5 @@
  * @return		Current value of specified DMMU TLB Tag Read Register.
  */
-NO_TRACE static inline uint64_t dtlb_tag_read_read(int tlb, size_t entry)
+_NO_TRACE static inline uint64_t dtlb_tag_read_read(int tlb, size_t entry)
 {
 	dtlb_tag_read_addr_t tag;
@@ -522,5 +522,5 @@
  * @param v		Value to be written.
  */
-NO_TRACE static inline void itlb_tag_access_write(uint64_t v)
+_NO_TRACE static inline void itlb_tag_access_write(uint64_t v)
 {
 	asi_u64_write(ASI_IMMU, VA_IMMU_TAG_ACCESS, v);
@@ -532,5 +532,5 @@
  * @return		Current value of IMMU TLB Tag Access Register.
  */
-NO_TRACE static inline uint64_t itlb_tag_access_read(void)
+_NO_TRACE static inline uint64_t itlb_tag_access_read(void)
 {
 	return asi_u64_read(ASI_IMMU, VA_IMMU_TAG_ACCESS);
@@ -541,5 +541,5 @@
  * @param v		Value to be written.
  */
-NO_TRACE static inline void dtlb_tag_access_write(uint64_t v)
+_NO_TRACE static inline void dtlb_tag_access_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_DMMU_TAG_ACCESS, v);
@@ -551,5 +551,5 @@
  * @return 		Current value of DMMU TLB Tag Access Register.
  */
-NO_TRACE static inline uint64_t dtlb_tag_access_read(void)
+_NO_TRACE static inline uint64_t dtlb_tag_access_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_TAG_ACCESS);
@@ -560,5 +560,5 @@
  * @param v		Value to be written.
  */
-NO_TRACE static inline void itlb_data_in_write(uint64_t v)
+_NO_TRACE static inline void itlb_data_in_write(uint64_t v)
 {
 	asi_u64_write(ASI_ITLB_DATA_IN_REG, 0, v);
@@ -570,5 +570,5 @@
  * @param v		Value to be written.
  */
-NO_TRACE static inline void dtlb_data_in_write(uint64_t v)
+_NO_TRACE static inline void dtlb_data_in_write(uint64_t v)
 {
 	asi_u64_write(ASI_DTLB_DATA_IN_REG, 0, v);
@@ -580,5 +580,5 @@
  * @return		Current content of I-SFSR register.
  */
-NO_TRACE static inline uint64_t itlb_sfsr_read(void)
+_NO_TRACE static inline uint64_t itlb_sfsr_read(void)
 {
 	return asi_u64_read(ASI_IMMU, VA_IMMU_SFSR);
@@ -589,5 +589,5 @@
  * @param v		New value of I-SFSR register.
  */
-NO_TRACE static inline void itlb_sfsr_write(uint64_t v)
+_NO_TRACE static inline void itlb_sfsr_write(uint64_t v)
 {
 	asi_u64_write(ASI_IMMU, VA_IMMU_SFSR, v);
@@ -599,5 +599,5 @@
  * @return		Current content of D-SFSR register.
  */
-NO_TRACE static inline uint64_t dtlb_sfsr_read(void)
+_NO_TRACE static inline uint64_t dtlb_sfsr_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_SFSR);
@@ -608,5 +608,5 @@
  * @param v		New value of D-SFSR register.
  */
-NO_TRACE static inline void dtlb_sfsr_write(uint64_t v)
+_NO_TRACE static inline void dtlb_sfsr_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_DMMU_SFSR, v);
@@ -618,5 +618,5 @@
  * @return		Current content of D-SFAR register.
  */
-NO_TRACE static inline uint64_t dtlb_sfar_read(void)
+_NO_TRACE static inline uint64_t dtlb_sfar_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_SFAR);
@@ -631,5 +631,5 @@
  * @param page		Address which is on the page to be demapped.
  */
-NO_TRACE static inline void itlb_demap(int type, int context_encoding, uintptr_t page)
+_NO_TRACE static inline void itlb_demap(int type, int context_encoding, uintptr_t page)
 {
 	tlb_demap_addr_t da;
@@ -657,5 +657,5 @@
  * @param page		Address which is on the page to be demapped.
  */
-NO_TRACE static inline void dtlb_demap(int type, int context_encoding, uintptr_t page)
+_NO_TRACE static inline void dtlb_demap(int type, int context_encoding, uintptr_t page)
 {
 	tlb_demap_addr_t da;
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -88,5 +88,5 @@
  * @return	Current value of Primary Context Register.
  */
-NO_TRACE static inline uint64_t mmu_primary_context_read(void)
+_NO_TRACE static inline uint64_t mmu_primary_context_read(void)
 {
 	return asi_u64_read(ASI_PRIMARY_CONTEXT_REG, VA_PRIMARY_CONTEXT_REG);
@@ -97,5 +97,5 @@
  * @param v	New value of Primary Context Register.
  */
-NO_TRACE static inline void mmu_primary_context_write(uint64_t v)
+_NO_TRACE static inline void mmu_primary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_PRIMARY_CONTEXT_REG, VA_PRIMARY_CONTEXT_REG, v);
@@ -106,5 +106,5 @@
  * @return	Current value of Secondary Context Register.
  */
-NO_TRACE static inline uint64_t mmu_secondary_context_read(void)
+_NO_TRACE static inline uint64_t mmu_secondary_context_read(void)
 {
 	return asi_u64_read(ASI_SECONDARY_CONTEXT_REG, VA_SECONDARY_CONTEXT_REG);
@@ -115,5 +115,5 @@
  * @param v	New value of Secondary Context Register.
  */
-NO_TRACE static inline void mmu_secondary_context_write(uint64_t v)
+_NO_TRACE static inline void mmu_secondary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_SECONDARY_CONTEXT_REG, VA_SECONDARY_CONTEXT_REG, v);
@@ -126,5 +126,5 @@
  * @param mmu_flag	MMU_FLAG_DTLB, MMU_FLAG_ITLB or a combination of both
  */
-NO_TRACE static inline void mmu_demap_ctx(int context, int mmu_flag)
+_NO_TRACE static inline void mmu_demap_ctx(int context, int mmu_flag)
 {
 	__hypercall_fast4(MMU_DEMAP_CTX, 0, 0, context, mmu_flag);
@@ -138,5 +138,5 @@
  * @param mmu_flag	MMU_FLAG_DTLB, MMU_FLAG_ITLB or a combination of both
  */
-NO_TRACE static inline void mmu_demap_page(uintptr_t vaddr, int context, int mmu_flag)
+_NO_TRACE static inline void mmu_demap_page(uintptr_t vaddr, int context, int mmu_flag)
 {
 	__hypercall_fast5(MMU_DEMAP_PAGE, 0, 0, vaddr, context, mmu_flag);
Index: kernel/arch/sparc64/include/arch/sun4u/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/asm.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/sun4u/asm.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -43,5 +43,5 @@
  *
  */
-NO_TRACE static inline uint64_t ver_read(void)
+_NO_TRACE static inline uint64_t ver_read(void)
 {
 	uint64_t v;
Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -76,5 +76,5 @@
  *
  */
-NO_TRACE static inline uint32_t read_mid(void)
+_NO_TRACE static inline uint32_t read_mid(void)
 {
 	uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0);
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/adt/list.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -150,5 +150,5 @@
  *
  */
-NO_TRACE static inline void link_initialize(link_t *link)
+_NO_TRACE static inline void link_initialize(link_t *link)
 {
 	link->prev = NULL;
@@ -163,5 +163,5 @@
  *
  */
-NO_TRACE static inline void list_initialize(list_t *list)
+_NO_TRACE static inline void list_initialize(list_t *list)
 {
 	list->head.prev = &list->head;
@@ -199,5 +199,5 @@
  *
  */
-NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
+_NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
 {
 	list_insert_after(link, &list->head);
@@ -212,5 +212,5 @@
  *
  */
-NO_TRACE static inline void list_append(link_t *link, list_t *list)
+_NO_TRACE static inline void list_append(link_t *link, list_t *list)
 {
 	list_insert_before(link, &list->head);
@@ -225,5 +225,5 @@
  *
  */
-NO_TRACE static inline void list_remove(link_t *link)
+_NO_TRACE static inline void list_remove(link_t *link)
 {
 	if ((link->prev != NULL) && (link->next != NULL)) {
@@ -242,5 +242,5 @@
  *
  */
-NO_TRACE static inline bool list_empty(const list_t *list)
+_NO_TRACE static inline bool list_empty(const list_t *list)
 {
 	return (list->head.next == &list->head);
@@ -310,5 +310,5 @@
  *
  */
-NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
 	part1->prev->next = part2;
@@ -331,5 +331,5 @@
  *
  */
-NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
 {
 	headless_list_split_or_concat(part1, part2);
@@ -346,5 +346,5 @@
  *
  */
-NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
 {
 	headless_list_split_or_concat(part1, part2);
@@ -361,5 +361,5 @@
  *
  */
-NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
+_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
 {
 	list_splice(list2, list1->head.prev);
Index: kernel/generic/include/bitops.h
===================================================================
--- kernel/generic/include/bitops.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/bitops.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -52,5 +52,5 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
+_NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
 {
 	uint8_t n = 0;
@@ -87,5 +87,5 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
+_NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
 {
 	uint8_t n = 0;
Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/context.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -91,5 +91,5 @@
  *
  */
-NO_TRACE static inline void context_restore(context_t *ctx)
+_NO_TRACE static inline void context_restore(context_t *ctx)
 {
 	context_restore_arch(ctx);
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/macros.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -49,5 +49,5 @@
  *
  */
-NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+_NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
     uint64_t sz2)
 {
@@ -78,5 +78,5 @@
  *
  */
-NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
+_NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
     uint64_t sz2)
 {
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/synch/spinlock.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -103,5 +103,5 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
 {
 	preemption_disable();
@@ -115,5 +115,5 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
 {
 	atomic_flag_clear_explicit(&lock->flag, memory_order_release);
Index: kernel/generic/include/trace.h
===================================================================
--- kernel/generic/include/trace.h	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/include/trace.h	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -36,5 +36,5 @@
 #define KERN_TRACE_H_
 
-#define NO_TRACE  __attribute__((no_instrument_function))
+#define _NO_TRACE  __attribute__((no_instrument_function))
 
 #endif
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/console/kconsole.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -156,5 +156,5 @@
 
 /** Print count times a character */
-NO_TRACE static void print_cc(wchar_t ch, size_t count)
+_NO_TRACE static void print_cc(wchar_t ch, size_t count)
 {
 	size_t i;
@@ -203,5 +203,5 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
+_NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
     hints_enum_func_t hints_enum)
 {
@@ -290,5 +290,5 @@
 }
 
-NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+_NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
 {
 	size_t start = 0;
@@ -331,5 +331,5 @@
 }
 
-NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
+_NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
     char *tmp)
 {
@@ -548,5 +548,5 @@
 }
 
-NO_TRACE static bool parse_int_arg(const char *text, size_t len,
+_NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     sysarg_t *result)
 {
@@ -637,5 +637,5 @@
  *
  */
-NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
+_NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     size_t *start, size_t *end)
 {
@@ -674,5 +674,5 @@
  *
  */
-NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
+_NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
 {
 	size_t start = 0;
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/ddi/ddi.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -121,5 +121,5 @@
  *
  */
-NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
+_NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
@@ -227,5 +227,5 @@
 }
 
-NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
+_NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
 {
 	assert(TASK);
@@ -312,5 +312,5 @@
  *
  */
-NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
+_NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
 	/*
@@ -353,5 +353,5 @@
  *
  */
-NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
+_NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
 	/*
@@ -413,5 +413,5 @@
 }
 
-NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
+_NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
 {
@@ -422,5 +422,5 @@
 }
 
-NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
+_NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys,
     uintptr_t *virt, uintptr_t bound)
@@ -451,5 +451,5 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
+_NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
 {
 	// TODO: implement unlocking & unmap
@@ -457,5 +457,5 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
+_NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
 {
 	return as_area_destroy(TASK->as, virt);
Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/interrupt/interrupt.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -99,5 +99,5 @@
  *
  */
-NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
+_NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
 {
 #if (IVT_ITEMS > 0)
@@ -159,5 +159,5 @@
  *
  */
-NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
+_NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
 {
 	fault_if_from_uspace(istate, "Unhandled exception %u.", n);
@@ -165,5 +165,5 @@
 }
 
-static NO_TRACE void
+static _NO_TRACE void
 fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
@@ -185,5 +185,5 @@
  *
  */
-NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
+_NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
 {
 	va_list args;
@@ -197,5 +197,5 @@
  *
  */
-NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+_NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
 	if (!istate_from_uspace(istate))
@@ -233,5 +233,5 @@
  *
  */
-NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
+_NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
 {
 	bool excs_all;
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/main/main.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -160,5 +160,5 @@
  *
  */
-NO_TRACE void main_bsp(void)
+_NO_TRACE void main_bsp(void)
 {
 	config.cpu_count = 1;
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/as.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -127,5 +127,5 @@
 static void used_space_shorten_ival(used_space_ival_t *, size_t);
 
-NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
+_NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
 {
 	as_t *as = (as_t *) obj;
@@ -137,5 +137,5 @@
 }
 
-NO_TRACE static size_t as_destructor(void *obj)
+_NO_TRACE static size_t as_destructor(void *obj)
 {
 	return as_destructor_arch((as_t *) obj);
@@ -281,5 +281,5 @@
  *
  */
-NO_TRACE void as_hold(as_t *as)
+_NO_TRACE void as_hold(as_t *as)
 {
 	refcount_up(&as->refcount);
@@ -294,5 +294,5 @@
  *
  */
-NO_TRACE void as_release(as_t *as)
+_NO_TRACE void as_release(as_t *as)
 {
 	if (refcount_down(&as->refcount))
@@ -340,5 +340,5 @@
  * @return True if the two areas conflict, false otherwise.
  */
-NO_TRACE static bool area_is_conflicting(uintptr_t addr,
+_NO_TRACE static bool area_is_conflicting(uintptr_t addr,
     size_t count, bool guarded, as_area_t *area)
 {
@@ -380,5 +380,5 @@
  *
  */
-NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
+_NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
     size_t count, bool guarded, as_area_t *avoid)
 {
@@ -474,5 +474,5 @@
  *
  */
-NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
+_NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
     size_t size, bool guarded)
 {
@@ -580,5 +580,5 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
 {
 	odict_initialize(&pagemap->map, as_pagemap_getkey, as_pagemap_cmp);
@@ -591,5 +591,5 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
 {
 	as_page_mapping_t *mapping = as_pagemap_first(pagemap);
@@ -606,5 +606,5 @@
  * @return First mapping or @c NULL if there is none
  */
-NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
+_NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
 {
 	odlink_t *odlink;
@@ -622,5 +622,5 @@
  * @return Next mapping or @c NULL if @a cur is the last one
  */
-NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
+_NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
 {
 	odlink_t *odlink;
@@ -640,5 +640,5 @@
  * @return EOK on succcess or ENOENT if no mapping found
  */
-NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t *rframe)
 {
@@ -663,5 +663,5 @@
  * @param frame Physical frame address
  */
-NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t frame)
 {
@@ -680,5 +680,5 @@
  * @param mapping Mapping
  */
-NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
+_NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
 {
 	odict_remove(&mapping->lpagemap);
@@ -693,5 +693,5 @@
  *
  */
-NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
+_NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
 {
 	bool dealloc = false;
@@ -861,5 +861,5 @@
  *
  */
-NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
+_NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
 {
 	assert(mutex_locked(&as->lock));
@@ -1305,5 +1305,5 @@
  *
  */
-NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
+_NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
 {
 	assert(mutex_locked(&area->lock));
@@ -1328,5 +1328,5 @@
  *
  */
-NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
+_NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
 {
 	unsigned int flags = PAGE_USER | PAGE_PRESENT;
@@ -1698,5 +1698,5 @@
  *
  */
-NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
+_NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
 {
 	assert(mutex_locked(&area->lock));
@@ -1746,5 +1746,5 @@
  *
  */
-NO_TRACE pte_t *page_table_create(unsigned int flags)
+_NO_TRACE pte_t *page_table_create(unsigned int flags)
 {
 	assert(as_operations);
@@ -1761,5 +1761,5 @@
  *
  */
-NO_TRACE void page_table_destroy(pte_t *page_table)
+_NO_TRACE void page_table_destroy(pte_t *page_table)
 {
 	assert(as_operations);
@@ -1782,5 +1782,5 @@
  *
  */
-NO_TRACE void page_table_lock(as_t *as, bool lock)
+_NO_TRACE void page_table_lock(as_t *as, bool lock)
 {
 	assert(as_operations);
@@ -1796,5 +1796,5 @@
  *
  */
-NO_TRACE void page_table_unlock(as_t *as, bool unlock)
+_NO_TRACE void page_table_unlock(as_t *as, bool unlock)
 {
 	assert(as_operations);
@@ -1811,5 +1811,5 @@
  *         are locked, otherwise false.
  */
-NO_TRACE bool page_table_locked(as_t *as)
+_NO_TRACE bool page_table_locked(as_t *as)
 {
 	assert(as_operations);
Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/frame.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -79,5 +79,5 @@
  *
  */
-NO_TRACE static void frame_initialize(frame_t *frame)
+_NO_TRACE static void frame_initialize(frame_t *frame)
 {
 	frame->refcount = 0;
@@ -100,5 +100,5 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
+_NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
     zone_flags_t flags)
 {
@@ -156,5 +156,5 @@
  *
  */
-NO_TRACE static size_t frame_total_free_get_internal(void)
+_NO_TRACE static size_t frame_total_free_get_internal(void)
 {
 	size_t total = 0;
@@ -167,5 +167,5 @@
 }
 
-NO_TRACE size_t frame_total_free_get(void)
+_NO_TRACE size_t frame_total_free_get(void)
 {
 	size_t total;
@@ -190,5 +190,5 @@
  *
  */
-NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
+_NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
 {
 	if (hint >= zones.count)
@@ -211,5 +211,5 @@
 
 /** @return True if zone can allocate specified number of frames */
-NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
+_NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -239,5 +239,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -265,5 +265,5 @@
  *
  */
-NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
+_NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
 {
 	return (base + count <= FRAME_LOWPRIO);
@@ -285,5 +285,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -322,5 +322,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -346,5 +346,5 @@
 
 /** Return frame from zone. */
-NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
+_NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
 {
 	assert(index < zone->count);
@@ -366,5 +366,5 @@
  *
  */
-NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
+_NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -405,5 +405,5 @@
  *
  */
-NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
+_NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
 {
 	assert(zone->flags & ZONE_AVAILABLE);
@@ -427,5 +427,5 @@
 
 /** Mark frame in zone unavailable to allocation. */
-NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
+_NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
 	assert(zone->flags & ZONE_AVAILABLE);
@@ -453,5 +453,5 @@
  *
  */
-NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
+_NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
     void *confdata)
 {
@@ -507,5 +507,5 @@
  *
  */
-NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
+_NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
 	assert(zones.info[znum].flags & ZONE_AVAILABLE);
@@ -623,5 +623,5 @@
  *
  */
-NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
+_NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
     zone_flags_t flags, void *confdata)
 {
@@ -1037,5 +1037,5 @@
  *
  */
-NO_TRACE void frame_reference_add(pfn_t pfn)
+_NO_TRACE void frame_reference_add(pfn_t pfn)
 {
 	irq_spinlock_lock(&zones.lock, true);
@@ -1056,5 +1056,5 @@
  *
  */
-NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
+_NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
 {
 	irq_spinlock_lock(&zones.lock, true);
Index: kernel/generic/src/mm/page.c
===================================================================
--- kernel/generic/src/mm/page.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/page.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -95,5 +95,5 @@
  *
  */
-NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
+_NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     unsigned int flags)
 {
@@ -120,5 +120,5 @@
  *
  */
-NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
+_NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
 {
 	assert(page_table_locked(as));
@@ -144,5 +144,5 @@
  *         the PTE is not guaranteed to be present.
  */
-NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
@@ -165,5 +165,5 @@
  * @param pte      New PTE.
  */
-NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/slab.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -158,5 +158,5 @@
  *
  */
-NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
+_NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     unsigned int flags)
 {
@@ -206,5 +206,5 @@
  *
  */
-NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
+_NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
 	frame_free(KA2PA(slab->start), slab->cache->frames);
@@ -218,5 +218,5 @@
 
 /** Map object to slab structure */
-NO_TRACE static slab_t *obj2slab(void *obj)
+_NO_TRACE static slab_t *obj2slab(void *obj)
 {
 	return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
@@ -234,5 +234,5 @@
  *
  */
-NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
+_NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     slab_t *slab)
 {
@@ -276,5 +276,5 @@
  *
  */
-NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
 {
 	irq_spinlock_lock(&cache->slablock, true);
@@ -332,5 +332,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
+_NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     bool first)
 {
@@ -357,5 +357,5 @@
  *
  */
-NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
+_NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -373,5 +373,5 @@
  *
  */
-NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
+_NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -392,5 +392,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
 {
 	slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -429,5 +429,5 @@
  *
  */
-NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
+_NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
 {
 	if (!CPU)
@@ -459,5 +459,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
 {
 	slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -509,5 +509,5 @@
  *
  */
-NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
+_NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
 {
 	if (!CPU)
@@ -538,5 +538,5 @@
  *
  */
-NO_TRACE static size_t comp_objects(slab_cache_t *cache)
+_NO_TRACE static size_t comp_objects(slab_cache_t *cache)
 {
 	if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -550,5 +550,5 @@
  *
  */
-NO_TRACE static size_t badness(slab_cache_t *cache)
+_NO_TRACE static size_t badness(slab_cache_t *cache)
 {
 	size_t objects = comp_objects(cache);
@@ -564,5 +564,5 @@
  *
  */
-NO_TRACE static bool make_magcache(slab_cache_t *cache)
+_NO_TRACE static bool make_magcache(slab_cache_t *cache)
 {
 	assert(_slab_initialized >= 2);
@@ -585,5 +585,5 @@
  *
  */
-NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
+_NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
     size_t size, size_t align, errno_t (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
@@ -660,5 +660,5 @@
  *
  */
-NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
 {
 	if (cache->flags & SLAB_CACHE_NOMAGAZINE)
@@ -707,5 +707,5 @@
  *
  */
-NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
+_NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
 	if (!obj)
Index: kernel/generic/src/proc/current.c
===================================================================
--- kernel/generic/src/proc/current.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/proc/current.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -70,5 +70,5 @@
  *
  */
-NO_TRACE void current_copy(current_t *src, current_t *dst)
+_NO_TRACE void current_copy(current_t *src, current_t *dst)
 {
 	assert(src->magic == MAGIC);
Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision 8df5f20c3e20072bcf616568836c1d08eba227c2)
@@ -62,5 +62,5 @@
  *
  */
-NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
+_NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
 {
 	sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -82,5 +82,5 @@
  *
  */
-NO_TRACE static size_t sysinfo_item_destructor(void *obj)
+_NO_TRACE static size_t sysinfo_item_destructor(void *obj)
 {
 	sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -124,5 +124,5 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
     sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
 {
@@ -190,5 +190,5 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
     sysinfo_item_t **psubtree)
 {
@@ -508,5 +508,5 @@
  *
  */
-NO_TRACE static void sysinfo_indent(size_t spaces)
+_NO_TRACE static void sysinfo_indent(size_t spaces)
 {
 	for (size_t i = 0; i < spaces; i++)
@@ -522,5 +522,5 @@
  *
  */
-NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
+_NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
 {
 	/* Walk all siblings */
@@ -622,5 +622,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -677,5 +677,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     bool dry_run)
 {
@@ -720,5 +720,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -786,5 +786,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
     bool dry_run)
 {