Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d0ae6716-c87f-f03d-7b66-ea899eaa7258@intel.com>
Date:   Thu, 4 May 2023 07:16:30 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: Re: linux-next: manual merge of the tip tree with the origin tree
Content-Language: en-US
To:     Mark Brown <broonie@finisterre.sirena.org.uk>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H . Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nhat Pham <nphamcs@gmail.com>,
        Rick Edgecombe <rick.p.edgecombe@intel.com>
References: <20230504131824.182744-1-broonie@finisterre.sirena.org.uk>
From:   Dave Hansen <dave.hansen@intel.com>
In-Reply-To: <20230504131824.182744-1-broonie@finisterre.sirena.org.uk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/4/23 06:18, Mark Brown wrote:
> diff --cc arch/x86/entry/syscalls/syscall_64.tbl
> index 227538b0ce801,f65c671ce3b14..0000000000000
> --- a/arch/x86/entry/syscalls/syscall_64.tbl
> +++ b/arch/x86/entry/syscalls/syscall_64.tbl
> @@@ -372,7 -372,7 +372,8 @@@
>   448	common	process_mrelease	sys_process_mrelease
>   449	common	futex_waitv		sys_futex_waitv
>   450	common	set_mempolicy_home_node	sys_set_mempolicy_home_node
>  -451	64	map_shadow_stack	sys_map_shadow_stack
>  +451	common	cachestat		sys_cachestat
> ++452	64	map_shadow_stack	sys_map_shadow_stack

Hi Mark,

This will break the shadow stack selftest:

	tools/testing/selftests/x86/test_shadow_stack.c

since it has:

	#define __NR_map_shadow_stack  451

This also missed bumping:

	#define __NR_syscalls 452

in include/uapi/asm-generic/unistd.h.