arm64 build broken on linux next 20201021 - include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds
arm64 build broken while building linux next 20201021 tag.
include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds #define __NR_watch_mount 441 ^
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org
build error log on arm64: -------------------------------- include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds #define __NR_watch_mount 441 ^ arch/arm64/kernel/sys.c:56:29: note: in definition of macro '__SYSCALL' #define __SYSCALL(nr, sym) [nr] = __arm64_##sym, ^~ include/uapi/asm-generic/unistd.h:863:11: note: in expansion of macro '__NR_watch_mount' __SYSCALL(__NR_watch_mount, sys_watch_mount) ^~~~~~~~~~~~~~~~ include/uapi/asm-generic/unistd.h:862:26: note: (near initialization for 'sys_call_table') #define __NR_watch_mount 441 ^ arch/arm64/kernel/sys.c:56:29: note: in definition of macro '__SYSCALL' #define __SYSCALL(nr, sym) [nr] = __arm64_##sym, ^~ include/uapi/asm-generic/unistd.h:863:11: note: in expansion of macro '__NR_watch_mount' __SYSCALL(__NR_watch_mount, sys_watch_mount) ^~~~~~~~~~~~~~~~ arch/arm64/kernel/sys.c:56:35: warning: excess elements in array initializer #define __SYSCALL(nr, sym) [nr] = __arm64_##sym, ^ include/uapi/asm-generic/unistd.h:863:1: note: in expansion of macro '__SYSCALL' __SYSCALL(__NR_watch_mount, sys_watch_mount) ^~~~~~~~~ arch/arm64/kernel/sys.c:56:35: note: (near initialization for 'sys_call_table') #define __SYSCALL(nr, sym) [nr] = __arm64_##sym, ^ include/uapi/asm-generic/unistd.h:863:1: note: in expansion of macro '__SYSCALL' __SYSCALL(__NR_watch_mount, sys_watch_mount) ^~~~~~~~~ scripts/Makefile.build:283: recipe for target 'arch/arm64/kernel/sys.o' failed | make[3]: *** [arch/arm64/kernel/sys.o] Error 1 scripts/Makefile.build:500: recipe for target 'arch/arm64/kernel' failed | make[2]: *** [arch/arm64/kernel] Error 2
full test log, https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-next/DISTRO=lkft...
Hi Naresh,
On Wed, 21 Oct 2020 10:35:10 +0530 Naresh Kamboju naresh.kamboju@linaro.org wrote:
arm64 build broken while building linux next 20201021 tag.
include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds #define __NR_watch_mount 441
Yeah, the __NR_syscalls in include/uapi/asm-generic/unistd.h needed to be fixed up in the notifications tree merge to be 442. Sorry about that, I will use the correct merge resolution tomorrow.
Hi Naresh,
On 21.10.2020 07:05, Naresh Kamboju wrote:
arm64 build broken while building linux next 20201021 tag.
include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds #define __NR_watch_mount 441 ^
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org
Conflict resolution in commit 5394c6318b32f is incomplete.
This fixes the build:
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index b3b2019f8d16..86a9d7b3eabe 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -38,7 +38,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
-#define __NR_compat_syscalls 441 +#define __NR_compat_syscalls 442 #endif
#define __ARCH_WANT_SYS_CLONE diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 094a685aa0f9..5df46517260e 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -863,7 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) __SYSCALL(__NR_watch_mount, sys_watch_mount)
#undef __NR_syscalls -#define __NR_syscalls 441 +#define __NR_syscalls 442
/* * 32 bit systems traditionally used different
Best regards
On Wed, 21 Oct 2020 at 12:06, Marek Szyprowski m.szyprowski@samsung.com wrote:
Hi Naresh,
On 21.10.2020 07:05, Naresh Kamboju wrote:
arm64 build broken while building linux next 20201021 tag.
include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds #define __NR_watch_mount 441 ^
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org
Conflict resolution in commit 5394c6318b32f is incomplete.
This fixes the build:
Thanks for the patch. I have applied this patch and build pass on arm64. Tested-by: Naresh Kamboju naresh.kamboju@linaro.org
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index b3b2019f8d16..86a9d7b3eabe 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -38,7 +38,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
-#define __NR_compat_syscalls 441 +#define __NR_compat_syscalls 442 #endif
#define __ARCH_WANT_SYS_CLONE diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 094a685aa0f9..5df46517260e 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -863,7 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) __SYSCALL(__NR_watch_mount, sys_watch_mount)
#undef __NR_syscalls -#define __NR_syscalls 441 +#define __NR_syscalls 442
/*
- 32 bit systems traditionally used different
- Naresh
-
Marek Szyprowski -
Naresh Kamboju -
Stephen Rothwell