aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhoon Kim <namhoonk@cs.unc.edu>2015-11-09 14:27:20 -0500
committerNamhoon Kim <namhoonk@cs.unc.edu>2015-11-09 14:38:50 -0500
commit632844f134629f9954c69432f55291d8d3a06cec (patch)
tree1eaedc9076d0bcbb39dc6c1aba192da929d660c1
parentd126eb2a5053f139e5bc1b37344edd88d32bd033 (diff)
Fix __NR_syscalls for ARM
__NR_syscalls must be a multiple of 4 for ARM. This patch adds padding to __NR_syscalls and fixes the missing NR_litmus_syscalls in include/litmus/unistd_32.h.
-rw-r--r--arch/arm/include/asm/unistd.h3
-rw-r--r--arch/arm/kernel/calls.S2
-rw-r--r--include/litmus/unistd_32.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 0c462a9e5205..7197bbe4dda1 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,8 @@
19 * This may need to be greater than __NR_last_syscall+1 in order to 19 * This may need to be greater than __NR_last_syscall+1 in order to
20 * account for the padding in the syscall table 20 * account for the padding in the syscall table
21 */ 21 */
22#define __NR_syscalls (388 + NR_litmus_syscalls) 22#define __NR_syscalls (388 + NR_litmus_syscalls + 3)
23
23 24
24/* 25/*
25 * *NOTE*: This is a ghost syscall private to the kernel. Only the 26 * *NOTE*: This is a ghost syscall private to the kernel. Only the
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 7736879e2173..3e002969469a 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -409,7 +409,7 @@
409 CALL(sys_wait_for_ts_release) 409 CALL(sys_wait_for_ts_release)
410 CALL(sys_release_ts) 410 CALL(sys_release_ts)
411 CALL(sys_null_call) 411 CALL(sys_null_call)
412/* 300 */ CALL(sys_get_current_budget) 412/* 400 */ CALL(sys_get_current_budget)
413 413
414 414
415#ifndef syscalls_counted 415#ifndef syscalls_counted
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index d9eab50f7a71..570b1f54d534 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -18,3 +18,5 @@
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_get_current_budget __LSC(12) 20#define __NR_get_current_budget __LSC(12)
21
22#define NR_litmus_syscalls 13