Changes in kernel/arch/arm32/include/asm.h [7a0359b:c22e964] in mainline

File:

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

kernel/arch/arm32/include/asm.h

@@ -38 +38 @@
 
 #include <typedefs.h>
+#include <arch/types.h>
 #include <arch/stack.h>
 #include <config.h>
 #include <arch/interrupt.h>
-#include <trace.h>
 
 /** No such instruction on ARM to sleep CPU. */
-NO_TRACE static inline void cpu_sleep(void)
+static inline void cpu_sleep(void)
 {
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+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;
@@ -85 +85 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
         uintptr_t v;
-        
         asm volatile (
                 "and %[v], sp, %[size]\n" 
@@ -94 +93 @@
                 : [size] "r" (~(STACK_SIZE - 1))
         );
-        
         return v;
 }
 
-extern void cpu_halt(void) __attribute__((noreturn));
+extern void cpu_halt(void);
 extern void asm_delay_loop(uint32_t t);
 extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,