From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751620AbbIGXf3 (ORCPT ); Mon, 7 Sep 2015 19:35:29 -0400 Received: from ozlabs.org ([103.22.144.67]:60296 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751135AbbIGXfZ (ORCPT ); Mon, 7 Sep 2015 19:35:25 -0400 Date: Tue, 8 Sep 2015 09:35:24 +1000 From: Stephen Rothwell To: Linus Cc: Andrea Arcangeli , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Lutomirski , Eric B Munson , "Dr. David Alan Gilbert" Subject: Re: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20150908093524.507a19d8@canb.auug.org.au> In-Reply-To: <20150729171256.GA10863@redhat.com> References: <20150728160015.142f588f@canb.auug.org.au> <20150729171256.GA10863@redhat.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, On Wed, 29 Jul 2015 19:12:56 +0200 Andrea Arcangeli wrote: > > On Tue, Jul 28, 2015 at 04:00:15PM +1000, Stephen Rothwell wrote: > > -359 i386 userfaultfd sys_userfaultfd > > ++374 i386 userfaultfd sys_userfaultfd > > Do I understand correctly the syscall number of userfaultfd for x86 > 32bit has just changed from 359 to 374? Appreciated that you CCed me > on such a relevant change to be sure I didn't miss it. > > Then the below is needed as well. The below patch was missed when the userfaultfd stuff and the x86 changes were merged. I have repeated the patch in the clear below. From: Andrea Arcangeli Date: Wed, 29 Jul 2015 18:53:17 +0200 Subject: [PATCH] userfaultfd: selftest: update userfaultfd x86 32bit syscall number It changed as result of linux-next merge of other syscalls. Signed-off-by: Andrea Arcangeli --- tools/testing/selftests/vm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 0c0b839..76071b1 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -69,7 +69,7 @@ #ifdef __x86_64__ #define __NR_userfaultfd 323 #elif defined(__i386__) -#define __NR_userfaultfd 359 +#define __NR_userfaultfd 374 #elif defined(__powewrpc__) #define __NR_userfaultfd 364 #else -- Cheers, Stephen Rothwell sfr@canb.auug.org.au