diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 20:52:29 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 21:01:20 -0500 |
| commit | 12d312072e3f4caa6e4e500d5a23c85402494cd1 (patch) | |
| tree | 9cde0ea468ea97c51d3c6370c9924827376efcc2 /arch/x86/kernel/syscall_table_32.S | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
| parent | 3d1c6d44d3f133909d1c594351c2b7c779b1d7d4 (diff) | |
Merge branch 'wip-pai' into wip-gpu-interrupts
Conflicts:
include/litmus/affinity.h
kernel/sched.c
kernel/softirq.c
litmus/Kconfig
litmus/affinity.c
litmus/litmus.c
litmus/preempt.c
litmus/sched_cedf.c
litmus/sched_gsn_edf.c
Diffstat (limited to 'arch/x86/kernel/syscall_table_32.S')
| -rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index d0126222b394..0cb4373698e7 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
| @@ -358,3 +358,4 @@ ENTRY(sys_call_table) | |||
| 358 | .long sys_wait_for_ts_release | 358 | .long sys_wait_for_ts_release |
| 359 | .long sys_release_ts /* +10 */ | 359 | .long sys_release_ts /* +10 */ |
| 360 | .long sys_null_call | 360 | .long sys_null_call |
| 361 | .long sys_register_nv_device | ||