Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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
To:     Naresh Kamboju <naresh.kamboju@linaro.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        lkft-triage@lists.linaro.org, Netdev <netdev@vger.kernel.org>,
        bpf <bpf@vger.kernel.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        linux-arch@vger.kernel.org
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Christian Brauner <christian@brauner.io>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
From:   Marek Szyprowski <m.szyprowski@samsung.com>
Message-ID: <12dfa2bb-e567-fb42-d74f-5aaa0c5c43df@samsung.com>
Date:   Wed, 21 Oct 2020 08:35:55 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0)
        Gecko/20100101 Thunderbird/78.3.3
MIME-Version: 1.0
In-Reply-To: <CA+G9fYuL9O2BLDfCWN7+aJRER3sQW=C-ayo4Tb7QKdffjMYKDw@mail.gmail.com>
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 201P
References: <CA+G9fYuL9O2BLDfCWN7+aJRER3sQW=C-ayo4Tb7QKdffjMYKDw@mail.gmail.com>
        <CGME20201021063555eucas1p24f8486354866fea4640a8f28e487d3c4@eucas1p2.samsung.com>
Precedence: bulk

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

-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland