While building lsk-3.10-android branch, we run into a series of build warnings for arm64 arch: ---------- In file included from arch/arm64/kernel/kuser32.S:32:0: /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:24:0: warning: "__NR_restart_syscall" redefined #define __NR_restart_syscall 0 ^ In file included from include/asm-generic/unistd.h:1:0, from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16, from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50, from arch/arm64/kernel/kuser32.S:31: include/uapi/asm-generic/unistd.h:390:0: note: this is the location of the previous definition #define __NR_restart_syscall 128 ^ In file included from arch/arm64/kernel/kuser32.S:32:0: /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd32.h:26:0: warning: "__NR_exit" redefined #define __NR_exit 1 ^ In file included from include/asm-generic/unistd.h:1:0, from /linaro/android/kernel/pundir/arch/arm64/include/uapi/asm/unistd.h:16, from /linaro/android/kernel/pundir/arch/arm64/include/asm/unistd.h:50, from arch/arm64/kernel/kuser32.S:31: include/uapi/asm-generic/unistd.h:292:0: note: this is the location of the previous definition #define __NR_exit 93 ^ ----------
This patch removes unitstd32.h include to avoid duplication of "__NR_" syscall definitions.
This patch is based on AOSP commit: cfc7e99e9e39, (arm64: Add __NR_* definitions for compat syscalls), which add __NR_* definitions to asm/unistd32.h, move the __NR_compat_* definitions to asm/unistd.h and removes all the explicit unistd32.h includes apart from the one building the compat syscall table. The aim is to have the compat __NR_* definitions available but without colliding with the native syscall definitions (required by lib/compat_audit.c to avoid duplicating the audit header files between native and compat).
Signed-off-by: Amit Pundir amit.pundir@linaro.org --- arch/arm64/kernel/kuser32.S | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/arm64/kernel/kuser32.S b/arch/arm64/kernel/kuser32.S index 9fb6d5a..997e6b2 100644 --- a/arch/arm64/kernel/kuser32.S +++ b/arch/arm64/kernel/kuser32.S @@ -29,7 +29,6 @@ */
#include <asm/unistd.h> -#include <asm/unistd32.h>
.align 5 .globl __kuser_helper_start