diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-10 13:30:24 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-10 13:30:24 -0400 |
| commit | 893c8943ce5c5527f05ab7e9208d5a942d77d8b5 (patch) | |
| tree | aa9e84b3503ff97c1d87bc9c2ce6682e51cfc971 /litmus/fdso.c | |
| parent | 901fdd9c22790039a76c1d3ee01828a2f124f6f3 (diff) | |
| parent | d3c32e91e3fce2a57083a734efae6d9de06ec02f (diff) | |
Merge branch 'prop/robust-tie-break' into wip-gpu-rtas12
Conflicts:
include/litmus/binheap.h
include/litmus/fdso.h
include/litmus/litmus.h
litmus/Makefile
litmus/binheap.c
litmus/edf_common.c
litmus/fdso.c
litmus/jobs.c
litmus/locking.c
Diffstat (limited to 'litmus/fdso.c')
| -rw-r--r-- | litmus/fdso.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/litmus/fdso.c b/litmus/fdso.c index 18fc61b6414a..bac6a35fa17d 100644 --- a/litmus/fdso.c +++ b/litmus/fdso.c | |||
| @@ -36,6 +36,10 @@ static const struct fdso_ops* fdso_ops[] = { | |||
| 36 | &generic_affinity_ops, /* KFMLP_SIMPLE_GPU_AFF_OBS */ | 36 | &generic_affinity_ops, /* KFMLP_SIMPLE_GPU_AFF_OBS */ |
| 37 | &generic_affinity_ops, /* KFMLP_GPU_AFF_OBS */ | 37 | &generic_affinity_ops, /* KFMLP_GPU_AFF_OBS */ |
| 38 | #endif | 38 | #endif |
| 39 | &generic_lock_ops, /* MPCP_SEM */ | ||
| 40 | &generic_lock_ops, /* MPCP_VS_SEM */ | ||
| 41 | &generic_lock_ops, /* DPCP_SEM */ | ||
| 42 | &generic_lock_ops, /* PCP_SEM */ | ||
| 39 | }; | 43 | }; |
| 40 | 44 | ||
| 41 | static int fdso_create(void** obj_ref, obj_type_t type, void* __user config) | 45 | static int fdso_create(void** obj_ref, obj_type_t type, void* __user config) |