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 /include/litmus/unistd_64.h | |
| 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 'include/litmus/unistd_64.h')
| -rw-r--r-- | include/litmus/unistd_64.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h index bf2ffeac2dbb..f80dc45dc185 100644 --- a/include/litmus/unistd_64.h +++ b/include/litmus/unistd_64.h | |||
| @@ -33,5 +33,8 @@ __SYSCALL(__NR_null_call, sys_null_call) | |||
| 33 | __SYSCALL(__NR_litmus_dgl_lock, sys_litmus_dgl_lock) | 33 | __SYSCALL(__NR_litmus_dgl_lock, sys_litmus_dgl_lock) |
| 34 | #define __NR_litmus_dgl_unlock __LSC(13) | 34 | #define __NR_litmus_dgl_unlock __LSC(13) |
| 35 | __SYSCALL(__NR_litmus_dgl_unlock, sys_litmus_dgl_unlock) | 35 | __SYSCALL(__NR_litmus_dgl_unlock, sys_litmus_dgl_unlock) |
| 36 | #define __NR_register_nv_device __LSC(14) | ||
| 37 | __SYSCALL(__NR_register_nv_device, sys_register_nv_device) | ||
| 36 | 38 | ||
| 37 | #define NR_litmus_syscalls 14 | 39 | |
| 40 | #define NR_litmus_syscalls 15 | ||