diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 20:52:29 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 21:01:20 -0500 |
| commit | 12d312072e3f4caa6e4e500d5a23c85402494cd1 (patch) | |
| tree | 9cde0ea468ea97c51d3c6370c9924827376efcc2 /litmus/Makefile | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
| parent | 3d1c6d44d3f133909d1c594351c2b7c779b1d7d4 (diff) | |
Merge branch 'wip-pai' into wip-gpu-interrupts
Conflicts:
include/litmus/affinity.h
kernel/sched.c
kernel/softirq.c
litmus/Kconfig
litmus/affinity.c
litmus/litmus.c
litmus/preempt.c
litmus/sched_cedf.c
litmus/sched_gsn_edf.c
Diffstat (limited to 'litmus/Makefile')
| -rw-r--r-- | litmus/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/litmus/Makefile b/litmus/Makefile index 7338180f196f..3acb335f3197 100644 --- a/litmus/Makefile +++ b/litmus/Makefile | |||
| @@ -27,3 +27,7 @@ obj-$(CONFIG_FEATHER_TRACE) += ft_event.o ftdev.o | |||
| 27 | obj-$(CONFIG_SCHED_TASK_TRACE) += sched_task_trace.o | 27 | obj-$(CONFIG_SCHED_TASK_TRACE) += sched_task_trace.o |
| 28 | obj-$(CONFIG_SCHED_DEBUG_TRACE) += sched_trace.o | 28 | obj-$(CONFIG_SCHED_DEBUG_TRACE) += sched_trace.o |
| 29 | obj-$(CONFIG_SCHED_OVERHEAD_TRACE) += trace.o | 29 | obj-$(CONFIG_SCHED_OVERHEAD_TRACE) += trace.o |
| 30 | |||
| 31 | obj-$(CONFIG_LITMUS_SOFTIRQD) += litmus_softirq.o | ||
| 32 | obj-$(CONFIG_LITMUS_PAI_SOFTIRQD) += litmus_pai_softirq.o | ||
| 33 | obj-$(CONFIG_LITMUS_NVIDIA) += nvidia_info.o sched_trace_external.o | ||