lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 Oct 2020 08:35:55 +0200 From: Marek Szyprowski <m.szyprowski@...sung.com> To: Naresh Kamboju <naresh.kamboju@...aro.org>, Stephen Rothwell <sfr@...b.auug.org.au>, Linux-Next Mailing List <linux-next@...r.kernel.org>, open list <linux-kernel@...r.kernel.org>, lkft-triage@...ts.linaro.org, Netdev <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>, Linux ARM <linux-arm-kernel@...ts.infradead.org>, linux-arch@...r.kernel.org Cc: Arnd Bergmann <arnd@...db.de>, Christian Brauner <christian@...uner.io>, Catalin Marinas <catalin.marinas@....com>, Will Deacon <will@...nel.org> Subject: Re: arm64 build broken on linux next 20201021 - include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds 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@...aro.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 -- Marek Szyprowski, PhD Samsung R&D Institute Poland
Powered by blists - more mailing lists