Changes in kernel/arch/mips32/include/asm.h [7a0359b:da1bafb] in mainline

File:

• kernel/arch/mips32/include/asm.h (modified) (3 diffs)

kernel/arch/mips32/include/asm.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <config.h>
-#include <trace.h>
 
-NO_TRACE static inline void cpu_sleep(void)
+static inline void cpu_sleep(void)
 {
-        /*
-         * Unfortunatelly most of the simulators do not support
-         *
-         * asm volatile (
-         *     "wait"
-         * );
-         *
-         */
+        /* Most of the simulators do not support */
+/*      asm volatile ("wait"); */
 }
 
@@ -59 +52 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
         uintptr_t base;
@@ -72 +65 @@
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+extern void cpu_halt(void) __attribute__((noreturn));
+extern void asm_delay_loop(uint32_t t);
+extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,
+    uintptr_t entry);
+
+extern ipl_t interrupts_disable(void);
+extern ipl_t interrupts_enable(void);
+extern void interrupts_restore(ipl_t ipl);
+extern ipl_t interrupts_read(void);
+extern bool interrupts_disabled(void);
+
+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)
+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)
+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)
+static inline uint8_t pio_read_8(ioport8_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
         return *port;
 }
-
-extern void cpu_halt(void) __attribute__((noreturn));
-extern void asm_delay_loop(uint32_t);
-extern void userspace_asm(uintptr_t, uintptr_t, uintptr_t);
-
-extern ipl_t interrupts_disable(void);
-extern ipl_t interrupts_enable(void);
-extern void interrupts_restore(ipl_t);
-extern ipl_t interrupts_read(void);
-extern bool interrupts_disabled(void);
 
 #endif