aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2013-10-09 15:45:23 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2013-10-09 15:47:26 -0400
commit7fb54decc59fa5855cd273bfda908fd443a37e67 (patch)
tree5941c299884d77e9ecd6be7e4041d94f00e01ef0 /include
parentb5b69edba68805ab2d4bdeae58fe783710111bfc (diff)
Remove PAI support
Support for process-aware interrupt handling was broken when the tasklet ownership model changed in GPUSync, post-ECRTS12. We will want to re-add support later, but remove it for now.
Diffstat (limited to 'include')
-rw-r--r--include/linux/interrupt.h2
-rw-r--r--include/litmus/sched_plugin.h5
-rw-r--r--include/litmus/trace.h5
3 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index af52b5c497b9..7ffc79559866 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -502,7 +502,7 @@ struct tasklet_struct
502 void (*func)(unsigned long); 502 void (*func)(unsigned long);
503 unsigned long data; 503 unsigned long data;
504#if 0 504#if 0
505#if defined(CONFIG_LITMUS_SOFTIRQD) || defined(CONFIG_LITMUS_PAI_SOFTIRQD) 505#if defined(CONFIG_LITMUS_SOFTIRQD)
506 struct task_struct *owner; 506 struct task_struct *owner;
507#endif 507#endif
508#endif 508#endif
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 82e62e8283e9..0982f5ff2631 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -165,11 +165,6 @@ struct sched_plugin {
165#ifdef CONFIG_LITMUS_AFFINITY_LOCKING 165#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
166 allocate_affinity_observer_t allocate_aff_obs; 166 allocate_affinity_observer_t allocate_aff_obs;
167#endif 167#endif
168#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
169 enqueue_pai_tasklet_t enqueue_pai_tasklet;
170 change_prio_pai_tasklet_t change_prio_pai_tasklet;
171 run_tasklets_t run_tasklets;
172#endif
173 168
174#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD) 169#if defined(CONFIG_LITMUS_NVIDIA) && defined(CONFIG_LITMUS_SOFTIRQD)
175 default_cpu_for_gpu_t map_gpu_to_cpu; 170 default_cpu_for_gpu_t map_gpu_to_cpu;
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index f10d8a0311cc..6410ab91f42d 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -160,11 +160,6 @@ feather_callback void save_timestamp_hide_irq(unsigned long event);
160#define TS_NV_RELEASE_BOTISR_END TIMESTAMP(205) 160#define TS_NV_RELEASE_BOTISR_END TIMESTAMP(205)
161#endif 161#endif
162 162
163#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
164#define TS_NV_SCHED_BOTISR_START TIMESTAMP(206)
165#define TS_NV_SCHED_BOTISR_END TIMESTAMP(207)
166#endif
167
168#define TS_RELEASE_LATENCY(when) LTIMESTAMP(208, &(when)) 163#define TS_RELEASE_LATENCY(when) LTIMESTAMP(208, &(when))
169 164
170#define TS_UPDATE_GPU_EST_START TIMESTAMP(210) 165#define TS_UPDATE_GPU_EST_START TIMESTAMP(210)