aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-04-23 20:08:48 -0400
committerJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-04-23 20:08:48 -0400
commit7c071e2f42c301ebf73c9b8e63ad7ecd1d1a1d8e (patch)
tree6ec6c0c6a5a638cb704afe0a5d6bc524f19ed00f /arch/i386
parentf6f293bee0fd39c2ffe3cd945da961f1470ad52c (diff)
parent3695e6b8dd1eeb288419674df951a35dd69ade52 (diff)
Merge with git+ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus
Bjoern's changes + mine. Still need to fill in some stubs and ensure that nothing broke.
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/syscall_table.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 10e0ce444d..1612a07ad5 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -329,8 +329,8 @@ ENTRY(sys_call_table)
329 .long sys_ni_syscall /* CLEANUP: sys_reset_stat */ 329 .long sys_ni_syscall /* CLEANUP: sys_reset_stat */
330 .long sys_sleep_next_period 330 .long sys_sleep_next_period
331 .long sys_scheduler_setup 331 .long sys_scheduler_setup
332 .long sys_ni_syscall /* to be replaced... */ 332 .long sys_enter_np
333 .long sys_ni_syscall /* 330 */ 333 .long sys_exit_np /* 330 */
334 .long sys_pi_sema_init 334 .long sys_pi_sema_init
335 .long sys_pi_down 335 .long sys_pi_down
336 .long sys_pi_up 336 .long sys_pi_up