On 17 June 2015 at 22:38, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
On 17 June 2015 at 03:24, Kevin Hilman khilman@linaro.org wrote:
Amit Pundir amit.pundir@linaro.org writes:
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),
This is also in mainline as of v3.17 as commit: f3e5c847ec3d arm64: Add __NR_* definitions for compat syscalls
Thanks for the reference.
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
If these compile problems were introduced by a mainline commit, how are the compile problems fixed in mainline? I don't see any other changes to this file since the above mainline commit.
There is a minute difference between both the commits. The commit in mainline v3.17 removes this problematic include asm/unistd32.h from arch/arm64/kernel/kuser32.S, similar to this patch of mine. The aosp commit, however, didn't have to deal with that include because it is not present in aosp/android-3.10 tree unlike lsk-v3.10-android tree.
Hmm, so why is the AOSP commit for the 3.18 kernel using the one from aosp/android-3.10 not the one from mainline (v3.17)?
Hi, I'm not sure from where the confusion started. May be I did not mention it explicitly enough but this patch is meant for lsk-3.10-android and not for 3.18.
Regards, Amit Pundir
Anyways, can you respin a patch with the changelog update referencing the mainline commit(s) and summarizing why the AOSP tree needs this fix and mainline does not.
Thanks,
Kevin