Index: kernel/arch/ppc32/include/arch/asm.h
===================================================================
--- kernel/arch/ppc32/include/arch/asm.h	(revision c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/asm.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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 c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/cpu.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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 c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/cycle.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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 c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/istate.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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 c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/mm/frame.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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 c477c804d1208352d69c7b069a54d3e3b650ff96)
+++ kernel/arch/ppc32/include/arch/mm/page.h	(revision 045186b0aef93f3aa6d7952248a1db55a0c08b5e)
@@ -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];