diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-04-15 15:03:33 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-04-15 15:03:33 -0400 |
| commit | b3ae67412531cbc583d5697d2366fc58d6dd07e7 (patch) | |
| tree | fba83da4fee9c8d5fa06ce253af50ce7c39197d9 /litmus/fdso.c | |
| parent | c0667dc4894e913048cf8904f0ce9a79b481b556 (diff) | |
| parent | adeff95dcdcf88789e983f20b0657f29286de8d7 (diff) | |
Merge branch 'wip-gpu-interrupts' into wip-gpu-rtss12
Conflicts:
include/litmus/fdso.h
include/litmus/rt_param.h
include/litmus/sched_plugin.h
include/litmus/unistd_32.h
include/litmus/unistd_64.h
litmus/Makefile
litmus/edf_common.c
litmus/litmus.c
litmus/locking.c
litmus/sched_gsn_edf.c
litmus/sched_plugin.c
Diffstat (limited to 'litmus/fdso.c')
| -rw-r--r-- | litmus/fdso.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/litmus/fdso.c b/litmus/fdso.c index 2000ba8a92f5..5ef858e59ab0 100644 --- a/litmus/fdso.c +++ b/litmus/fdso.c | |||
| @@ -22,6 +22,7 @@ extern struct fdso_ops generic_lock_ops; | |||
| 22 | 22 | ||
| 23 | static const struct fdso_ops* fdso_ops[] = { | 23 | static const struct fdso_ops* fdso_ops[] = { |
| 24 | &generic_lock_ops, /* FMLP_SEM */ | 24 | &generic_lock_ops, /* FMLP_SEM */ |
| 25 | &generic_lock_ops, /* KFMLP_SEM */ | ||
| 25 | &generic_lock_ops, /* SRP_SEM */ | 26 | &generic_lock_ops, /* SRP_SEM */ |
| 26 | &generic_lock_ops, /* RSM_MUTEX */ | 27 | &generic_lock_ops, /* RSM_MUTEX */ |
| 27 | &generic_lock_ops, /* IKGLP_SEM */ | 28 | &generic_lock_ops, /* IKGLP_SEM */ |