3 files changed, 20 insertions, 2 deletions

diff --git a/litmus/ctrldev.c b/litmus/ctrldev.c
index 9969ab17c190..41919b2714cb 100644
--- a/litmus/ctrldev.c
+++ b/litmus/ctrldev.c
@@ -133,6 +133,17 @@ static int __init init_litmus_ctrl_dev(void)
 
         BUILD_BUG_ON(sizeof(struct control_page) > PAGE_SIZE);
 
+        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint64_t));
+
+        BUILD_BUG_ON(offsetof(struct control_page, sched.raw)
+                     != LITMUS_CP_OFFSET_SCHED);
+        BUILD_BUG_ON(offsetof(struct control_page, irq_count)
+                     != LITMUS_CP_OFFSET_IRQ_COUNT);
+        BUILD_BUG_ON(offsetof(struct control_page, ts_syscall_start)
+                     != LITMUS_CP_OFFSET_TS_SC_START);
+        BUILD_BUG_ON(offsetof(struct control_page, irq_syscall_start)
+                     != LITMUS_CP_OFFSET_IRQ_SC_START);
+
         printk("Initializing LITMUS^RT control device.\n");
         err = misc_register(&litmus_ctrl_dev);
         if (err)
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 81384327e850..c842de46587b 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -536,8 +536,6 @@ static int __init _init_litmus(void)
          */
         printk("Starting LITMUS^RT kernel\n");
 
-        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint32_t));
-
         register_sched_plugin(&linux_sched_plugin);
 
         bheap_node_cache    = KMEM_CACHE(bheap_node, SLAB_PANIC);
diff --git a/litmus/trace.c b/litmus/trace.c
index fc1d03f35d39..c511003ea911 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -18,6 +18,15 @@ static unsigned int ts_seq_no = 0;
 
 DEFINE_PER_CPU(atomic_t, irq_fired_count);
 
+void ft_irq_fired(void)
+{
+        /* Only called with preemptions disabled.  */
+        atomic_inc(&__get_cpu_var(irq_fired_count));
+
+        if (has_control_page(current))
+                get_control_page(current)->irq_count++;
+}
+
 static inline void clear_irq_fired(void)
 {
         atomic_set(&__raw_get_cpu_var(irq_fired_count), 0);