From a17f532bb1056742dc0ebbb6182bda063836316d Mon Sep 17 00:00:00 2001 From: Namhoon Kim Date: Mon, 9 Nov 2015 14:27:20 -0500 Subject: 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. --- arch/arm/include/asm/unistd.h | 3 ++- arch/arm/kernel/calls.S | 2 +- include/litmus/unistd_32.h | 2 ++ 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 @@ * This may need to be greater than __NR_last_syscall+1 in order to * account for the padding in the syscall table */ -#define __NR_syscalls (388 + NR_litmus_syscalls) +#define __NR_syscalls (388 + NR_litmus_syscalls + 3) + /* * *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 @@ CALL(sys_wait_for_ts_release) CALL(sys_release_ts) CALL(sys_null_call) -/* 300 */ CALL(sys_get_current_budget) +/* 400 */ CALL(sys_get_current_budget) #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 @@ #define __NR_release_ts __LSC(10) #define __NR_null_call __LSC(11) #define __NR_get_current_budget __LSC(12) + +#define NR_litmus_syscalls 13 -- cgit v1.2.2