diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-02-19 13:21:00 +0530 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-02-25 13:48:01 +0000 |
| commit | ccc705d17826d707dd6efba9caf76896b0040e57 (patch) | |
| tree | e024e5482d01f4fd8966532d7bc317b6297c2720 | |
| parent | 91c5d893c3408a727f8987bd20d6a05174773d11 (diff) | |
arm64: kuser32-bit helpers: do not include unistd32.h explicitlylsk-3.10-armlt-juno-20150225
We get following warnings while building for arm64 arch:
----->8-----
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
^
-----8<-----
This patch removes unitstd32.h include to avoid duplication of
"__NR_" syscall definitions.
This patch is based on AOSP commit: cfc7e99e9e3900056028a7d90072e9ea0d886f8d,
"arm64: Add __NR_* definitions for compat syscalls", which adds
__NR_* definitions to asm/unistd32.h, moves 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>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm64/kernel/kuser32.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/kuser32.S b/arch/arm64/kernel/kuser32.S index 9fb6d5a3cea7..997e6b27ff6a 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 |