Index: kernel/arch/ia32/include/arch/asm.h
===================================================================
--- kernel/arch/ia32/include/arch/asm.h	(revision 8be323084b791c62927f9cbb14696265246370dd)
+++ kernel/arch/ia32/include/arch/asm.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -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 8be323084b791c62927f9cbb14696265246370dd)
+++ kernel/arch/ia32/include/arch/cycle.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -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 8be323084b791c62927f9cbb14696265246370dd)
+++ kernel/arch/ia32/include/arch/istate.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -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 8be323084b791c62927f9cbb14696265246370dd)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -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];