diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-11 22:42:51 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-11 22:42:51 -0400 |
| commit | c1d1979c99ca397241da4e3d7e0cb77f7ec28240 (patch) | |
| tree | 2a988aae1ae7c08891543e844171cbcb4281a5bb /include/litmus/unistd_32.h | |
| parent | fd3aa01f176cf12b1625f4f46ba01f3340bb57ed (diff) | |
| parent | 55e04c94b925b0790c2ae0a79f16e939e9bb2846 (diff) | |
Merge branch 'wip-gpu-rtas12' into wip-slave-threads
Conflicts:
include/litmus/unistd_32.h
include/litmus/unistd_64.h
litmus/litmus.c
Diffstat (limited to 'include/litmus/unistd_32.h')
| -rw-r--r-- | include/litmus/unistd_32.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h index bcb8f1183b4f..4fd92956d13f 100644 --- a/include/litmus/unistd_32.h +++ b/include/litmus/unistd_32.h | |||
| @@ -17,7 +17,10 @@ | |||
| 17 | #define __NR_wait_for_ts_release __LSC(9) | 17 | #define __NR_wait_for_ts_release __LSC(9) |
| 18 | #define __NR_release_ts __LSC(10) | 18 | #define __NR_release_ts __LSC(10) |
| 19 | #define __NR_null_call __LSC(11) | 19 | #define __NR_null_call __LSC(11) |
| 20 | #define __NR_litmus_dgl_lock __LSC(12) | ||
| 21 | #define __NR_litmus_dgl_unlock __LSC(13) | ||
| 22 | #define __NR_register_nv_device __LSC(14) | ||
| 20 | 23 | ||
| 21 | #define __NR_slave_non_rt_threads _LSC(12) | 24 | #define __NR_slave_non_rt_threads _LSC(15) |
| 22 | 25 | ||
| 23 | #define NR_litmus_syscalls 13 | 26 | #define NR_litmus_syscalls 16 |