From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6040C55179 for ; Wed, 21 Oct 2020 14:13:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FBA322249 for ; Wed, 21 Oct 2020 14:13:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qr0IsgIL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2443326AbgJUOND (ORCPT ); Wed, 21 Oct 2020 10:13:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441041AbgJUONC (ORCPT ); Wed, 21 Oct 2020 10:13:02 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73748C0613CF for ; Wed, 21 Oct 2020 07:13:02 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id k6so3326708ior.2 for ; Wed, 21 Oct 2020 07:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uIZP42Vh+ckbjFikdJfke/JG3gnAQkbegdmiTzAtVuQ=; b=qr0IsgILjZxYrcVxGnK0xMFQSsO4X2yUBYbxxx5/nLK7I4WUdVcGC+34t4t24//QSL lTi4C0rDLabB3WIATPVWq7Gx/tClFCZ26ycN9QS95x4RDvZp0J2sXw5D+VUWn4HeevL5 9mlEyDGjiTobyQUQ1YoHuLvss6/a2hI2Ib37yCMMxKF4C+EtpbfKXE2vZDIEdir5FO5t bdD5Z5+CdQOc8gOIcQ1DIcd8CmBk0YUtQLxA/TQEDeSKFQWQ/gFiITJ6VXJsfUHk+84M XmTk8SnOYNiwPKDMCnkIhk1n0PZuZLgZsSosmhg96ZH/wYjZ8O5PZ3awgID9f+9DFC98 DMGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uIZP42Vh+ckbjFikdJfke/JG3gnAQkbegdmiTzAtVuQ=; b=L7HanXufPdTRelxqr4ETEHMPy+R79rCX9QCyC8ves1UHM1AnxqSb8ldEP+hy+d2P4z wm3/SIERBSaspX6G/vaBZ9eBANZiAjnLuEQnk78nK02F9QyFQAc+ihQ1N5vadT5+mCay VqaH/8g9ZKgRK/ovjt8ot+FHPpwEqlB5We4ReDtX+yDh6M6sEpleKGGIdhANfE66TcDJ vRUxW/g43HBMDlT2wMbDFildwhZRMjJ7vfeWMIagcy6zrSfzRsa5VJXXGSNZzO9h6ycD 6ROML9GKC7mdyBltsnI2I25wBhhfu8J1g1eoyEa9emFQIbf+PL9Wyloh04skUJk/YvRZ vSBQ== X-Gm-Message-State: AOAM531VSCBW29X6YpsJCO4m2H6BFjVpDfeVxhPMf6zG54fqNn4wTvWq rZeuIG6oyiXR71hh/F6Y3xbkm98PpaiCaoYCHAvDtA== X-Google-Smtp-Source: ABdhPJwb36VWE/96YU44fNuEzYtyD4OBEaEHy05VO9xeNMg79V+hWEmkV1UktkKwfQgUqer4fxUfs/k/5T92j2nxOgY= X-Received: by 2002:a6b:8b95:: with SMTP id n143mr442371iod.36.1603289581571; Wed, 21 Oct 2020 07:13:01 -0700 (PDT) MIME-Version: 1.0 References: <12dfa2bb-e567-fb42-d74f-5aaa0c5c43df@samsung.com> In-Reply-To: <12dfa2bb-e567-fb42-d74f-5aaa0c5c43df@samsung.com> From: Naresh Kamboju Date: Wed, 21 Oct 2020 19:42:50 +0530 Message-ID: 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: Marek Szyprowski Cc: Stephen Rothwell , Linux-Next Mailing List , open list , lkft-triage@lists.linaro.org, Netdev , bpf , Linux ARM , linux-arch@vger.kernel.org, Arnd Bergmann , Christian Brauner , Catalin Marinas , Will Deacon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 21 Oct 2020 at 12:06, Marek Szyprowski 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 > > 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 > > 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