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

File:

• kernel/arch/ppc32/include/asm.h (modified) (13 diffs)

kernel/arch/ppc32/include/asm.h

@@ -40 +40 @@
 #include <arch/cpu.h>
 #include <arch/mm/asid.h>
-#include <trace.h>
-
-NO_TRACE static inline uint32_t msr_read(void)
+
+static inline uint32_t msr_read(void)
 {
         uint32_t msr;
@@ -54 +53 @@
 }
 
-NO_TRACE static inline void msr_write(uint32_t msr)
+static inline void msr_write(uint32_t msr)
 {
         asm volatile (
@@ -62 +61 @@
 }
 
-NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
+static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
 {
         asm volatile (
@@ -71 +70 @@
 }
 
-NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
+static inline uint32_t sr_get(uint32_t vaddr)
 {
         uint32_t vsid;
@@ -84 +83 @@
 }
 
-NO_TRACE static inline uint32_t sdr1_get(void)
+static inline uint32_t sdr1_get(void)
 {
         uint32_t sdr1;
@@ -104 +103 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+static inline ipl_t interrupts_enable(void)
 {
         ipl_t ipl = msr_read();
@@ -119 +118 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+static inline ipl_t interrupts_disable(void)
 {
         ipl_t ipl = msr_read();
@@ -133 +132 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+static inline void interrupts_restore(ipl_t ipl)
 {
         msr_write((msr_read() & (~MSR_EE)) | (ipl & MSR_EE));
@@ -145 +144 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+static inline ipl_t interrupts_read(void)
 {
         return msr_read();
@@ -155 +154 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+static inline bool interrupts_disabled(void)
 {
         return ((msr_read() & MSR_EE) == 0);
@@ -167 +166 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
         uintptr_t base;
@@ -180 +179 @@
 }
 
-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)
-{
-        *port = 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)
-{
-        return *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)
-{
-        return *port;
+static inline void cpu_sleep(void)
+{
 }
 
@@ -218 +187 @@
 extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+        *port = v;
+}
+
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+        *port = v;
+}
+
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+        *port = v;
+}
+
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+        return *port;
+}
+
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+        return *port;
+}
+
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+        return *port;
+}
+
 #endif