Changes in kernel/arch/amd64/include/asm.h [d99c1d2:3d6beaa] in mainline

File:

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

kernel/arch/amd64/include/asm.h

@@ -38 +38 @@
 #include <config.h>
 #include <typedefs.h>
+#include <arch/cpu.h>
 
 extern void asm_delay_loop(uint32_t t);
@@ -269 +270 @@
         return v;
 }
+
+/** Check interrupts state.
+ *
+ * @return True if interrupts are disabled.
+ *
+ */
+static inline bool interrupts_disabled(void)
+{
+        ipl_t v;
+        
+        asm volatile (
+                "pushfq\n"
+                "popq %[v]\n"
+                : [v] "=r" (v)
+        );
+        
+        return ((v & RFLAGS_IF) == 0);
+}
+
 
 /** Write to MSR */
@@ -310 +330 @@
                 ::: "%eax","%ecx","%edx"
         );
-}
-
-static inline uintptr_t * get_ip() 
-{
-        uintptr_t *ip;
-        
-        asm volatile (
-                "mov %%rip, %[ip]"
-                : [ip] "=r" (ip)
-        );
-        
-        return ip;
 }