Merge branch 'wip-gpu-cleanup' into wip-2012.3-gpu

Conflicts:
	include/litmus/fpmath.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/trace.h
	kernel/sched.c
	kernel/softirq.c
	litmus/edf_common.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c
	litmus/sched_litmus.c
	litmus/sync.c

1 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9c990d13ae35..d580959f9f5c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1532,8 +1532,12 @@ struct task_struct {
 #endif
         struct prop_local_single dirties;
 
-        /* LITMUS RT parameters and state */
+        /*** LITMUS RT parameters and state ***/
         struct rt_param rt_param;
+#ifdef CONFIG_REALTIME_AUX_TASKS
+        struct aux_data aux_data;
+#endif
+        /*****/
 
         /* references to PI semaphores, etc. */
         struct od_table_entry *od_table;