1 files changed, 6 insertions, 9 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index ce76faa9c6d7..7b9a90965c25 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -84,12 +84,12 @@ struct rt_task {
 };
 
 union np_flag {
-        uint64_t raw;
+        uint32_t raw;
         struct {
                 /* Is the task currently in a non-preemptive section? */
-                uint64_t flag:31;
+                uint32_t flag:31;
                 /* Should the task call into the scheduler? */
-                uint64_t preempt:1;
+                uint32_t preempt:1;
         } np;
 };
 
@@ -110,10 +110,10 @@ union np_flag {
 struct control_page {
         /* This flag is used by userspace to communicate non-preempive
          * sections. */
-        volatile union np_flag sched;
+        volatile __attribute__ ((aligned (8))) union np_flag sched;
 
-        volatile uint64_t irq_count; /* Incremented by the kernel each time an IRQ is
-                                      * handled. */
+        /* Incremented by the kernel each time an IRQ is handled. */
+        volatile __attribute__ ((aligned (8))) uint64_t irq_count;
 
         /* Locking overhead tracing: userspace records here the time stamp
          * and IRQ counter prior to starting the system call. */
@@ -171,9 +171,6 @@ struct pfair_param;
  *      be explicitly set up before the task set is launched.
  */
 struct rt_param {
-        /* Generic flags available for plugin-internal use. */
-        unsigned int            flags:8;
-
         /* do we need to check for srp blocking? */
         unsigned int            srp_non_recurse:1;