Changes in kernel/arch/ia64/include/cpu.h [7a0359b:d99c1d2] in mainline

File:

• kernel/arch/ia64/include/cpu.h (modified) (2 diffs)

kernel/arch/ia64/include/cpu.h

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <arch/bootinfo.h>
-#include <trace.h>
 
-#define FAMILY_ITANIUM   0x7
-#define FAMILY_ITANIUM2  0x1f
-
-#define CR64_ID_SHIFT   24
-#define CR64_ID_MASK    0xff000000
-#define CR64_EID_SHIFT  16
-#define CR64_EID_MASK   0xff0000
+#define FAMILY_ITANIUM  0x7
+#define FAMILY_ITANIUM2 0x1f
 
 typedef struct {
@@ -61 +55 @@
  *
  * @return Value of CPUID[n] register.
- *
  */
-NO_TRACE static inline uint64_t cpuid_read(int n)
+static inline uint64_t cpuid_read(int n)
 {
         uint64_t v;
         
-        asm volatile (
-                "mov %[v] = cpuid[%[r]]\n"
-                : [v] "=r" (v)
-                : [r] "r" (n)
-        );
+        asm volatile ("mov %0 = cpuid[%1]\n" : "=r" (v) : "r" (n));
         
         return v;
 }
 
-NO_TRACE static inline int ia64_get_cpu_id(void)
+
+#define CR64_ID_SHIFT 24
+#define CR64_ID_MASK 0xff000000
+#define CR64_EID_SHIFT 16
+#define CR64_EID_MASK 0xff0000
+
+static inline int ia64_get_cpu_id(void)
 {
-        uint64_t cr64 = cr64_read();
-        return ((CR64_ID_MASK) &cr64) >> CR64_ID_SHIFT;
+        uint64_t cr64=cr64_read();
+        return ((CR64_ID_MASK)&cr64)>>CR64_ID_SHIFT;
 }
 
-NO_TRACE static inline int ia64_get_cpu_eid(void)
+static inline int ia64_get_cpu_eid(void)
 {
-        uint64_t cr64 = cr64_read();
-        return ((CR64_EID_MASK) &cr64) >> CR64_EID_SHIFT;
+        uint64_t cr64=cr64_read();
+        return ((CR64_EID_MASK)&cr64)>>CR64_EID_SHIFT;
 }
 
-NO_TRACE static inline void ipi_send_ipi(int id, int eid, int intno)
+
+static inline void ipi_send_ipi(int id, int eid, int intno)
 {
         (bootinfo->sapic)[2 * (id * 256 + eid)] = intno;
         srlz_d();
+
 }