diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/kernel/syscall_table_32.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/kernel/syscall_table_32.S')
| -rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index 37702905f658..d0126222b394 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
| @@ -340,15 +340,21 @@ ENTRY(sys_call_table) | |||
| 340 | .long sys_fanotify_init | 340 | .long sys_fanotify_init |
| 341 | .long sys_fanotify_mark | 341 | .long sys_fanotify_mark |
| 342 | .long sys_prlimit64 /* 340 */ | 342 | .long sys_prlimit64 /* 340 */ |
| 343 | .long sys_set_rt_task_param /* LITMUS^RT 341 */ | 343 | .long sys_name_to_handle_at |
| 344 | .long sys_open_by_handle_at | ||
| 345 | .long sys_clock_adjtime | ||
| 346 | .long sys_syncfs | ||
| 347 | .long sys_sendmmsg /* 345 */ | ||
| 348 | .long sys_setns | ||
| 349 | .long sys_set_rt_task_param /* LITMUS^RT 347 */ | ||
| 344 | .long sys_get_rt_task_param | 350 | .long sys_get_rt_task_param |
| 345 | .long sys_complete_job | 351 | .long sys_complete_job |
| 346 | .long sys_od_open | 352 | .long sys_od_open |
| 347 | .long sys_od_close | 353 | .long sys_od_close |
| 348 | .long sys_litmus_lock | 354 | .long sys_litmus_lock /* +5 */ |
| 349 | .long sys_litmus_unlock | 355 | .long sys_litmus_unlock |
| 350 | .long sys_query_job_no | 356 | .long sys_query_job_no |
| 351 | .long sys_wait_for_job_release | 357 | .long sys_wait_for_job_release |
| 352 | .long sys_wait_for_ts_release | 358 | .long sys_wait_for_ts_release |
| 353 | .long sys_release_ts | 359 | .long sys_release_ts /* +10 */ |
| 354 | .long sys_null_call | 360 | .long sys_null_call |