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

File:

• kernel/arch/ia64/include/interrupt.h (modified) (3 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch/register.h>
-#include <trace.h>
 
 /** ia64 has 256 INRs. */
@@ -134 +133 @@
 } istate_t;
 
-extern void *ivt;
-
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
-    uintptr_t retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
         istate->cr_iip = retaddr;
@@ -143 +139 @@
 }
 
-NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
         return istate->cr_iip;
 }
 
-NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
+static inline unative_t istate_get_fp(istate_t *istate)
 {
-        /* FIXME */
-        
-        return 0;
+        return 0;       /* FIXME */
 }
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+static inline int istate_from_uspace(istate_t *istate)
 {
         return (istate->cr_iip) < 0xe000000000000000ULL;
 }
 
-extern void general_exception(uint64_t, istate_t *);
-extern int break_instruction(uint64_t, istate_t *);
-extern void universal_handler(uint64_t, istate_t *);
-extern void nop_handler(uint64_t, istate_t *);
-extern void external_interrupt(uint64_t, istate_t *);
-extern void disabled_fp_register(uint64_t, istate_t *);
+extern void *ivt;
 
-extern void trap_virtual_enable_irqs(uint16_t);
+extern void general_exception(uint64_t vector, istate_t *istate);
+extern int break_instruction(uint64_t vector, istate_t *istate);
+extern void universal_handler(uint64_t vector, istate_t *istate);
+extern void nop_handler(uint64_t vector, istate_t *istate);
+extern void external_interrupt(uint64_t vector, istate_t *istate);
+extern void disabled_fp_register(uint64_t vector, istate_t *istate);
+
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
 
 #endif