aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Ward <bcw@cs.unc.edu>2012-08-07 14:29:12 -0400
committerBryan Ward <bcw@cs.unc.edu>2013-04-16 14:33:48 -0400
commit4005b45d832a3affc6c4e1c4575d3112d188f3ee (patch)
treeea8067fc9dd4d6931060d35e4e30b62bbe8e5a2b
parent5759d92625cfb9cfdf7defd3b5d8ebedc4f205cf (diff)
Chris help!
-rw-r--r--arch/arm/kernel/calls.S3
-rw-r--r--arch/x86/kernel/syscall_table_32.S3
-rw-r--r--litmus/locking.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index ed2ae934127e..3444f32562ea 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -397,6 +397,9 @@
397/* 385 */ CALL(sys_wait_for_ts_release) 397/* 385 */ CALL(sys_wait_for_ts_release)
398 CALL(sys_release_ts) 398 CALL(sys_release_ts)
399 CALL(sys_null_call) 399 CALL(sys_null_call)
400 CALL(sys_dynamic_group_lock)
401 CALL(sys_dynamic_group_unlock)
402 CALL(sys_dynamic_group_add)
400#ifndef syscalls_counted 403#ifndef syscalls_counted
401.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls 404.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
402#define syscalls_counted 405#define syscalls_counted
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index d0126222b394..47028d2ff1ac 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -358,3 +358,6 @@ 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_dynamic_group_lock
362 .long sys_dynamic_group_unlock
363 .long sys_dynamic_group_add
diff --git a/litmus/locking.c b/litmus/locking.c
index 6ddc22b7de11..e0e6c1dc6256 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -76,7 +76,7 @@ bool check_mask_valid(resource_mask_t mask)
76 return true; 76 return true;
77} 77}
78 78
79asmlinkage long sys_dynamic_group_lock(resource_mask_t mask) 79asmlinkage long sys_dynamic_group_lock(int mask)
80{ 80{
81 //long err = -EINVAL; 81 //long err = -EINVAL;
82 82
@@ -87,7 +87,7 @@ asmlinkage long sys_dynamic_group_lock(resource_mask_t mask)
87 //return err; 87 //return err;
88 88
89 TRACE("Successfully called the dynamic group lock system call"); 89 TRACE("Successfully called the dynamic group lock system call");
90 printk("printk: Successfully called the dynamic group lock system call"); 90 printk(KERN_INFO "printk: Successfully called the dynamic group lock system call");
91 return -EINVAL; 91 return -EINVAL;
92} 92}
93 93