Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1220421

Re: linux-next: manual merge of the akpm-current tree with the tip tree

Show all headers | View raw

Hi Linus,

On Wed, 29 Jul 2015 19:12:56 +0200 Andrea Arcangeli <aarcange@redhat.com> 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 <aarcange@redhat.com>
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 <aarcange@redhat.com>
---
 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: linux-next: manual merge of the akpm-current tree with the tip  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-08 01:40 +0200
  Re: linux-next: manual merge of the akpm-current tree with the tip tree Linus Torvalds <torvalds@linux-foundation.org> - 2015-09-08 20:20 +0200
    Re: linux-next: manual merge of the akpm-current tree with the tip  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-09 01:00 +0200
      Re: linux-next: manual merge of the akpm-current tree with the tip tree Linus Torvalds <torvalds@linux-foundation.org> - 2015-09-09 01:10 +0200
        Re: linux-next: manual merge of the akpm-current tree with the tip  tree Andrew Morton <akpm@linux-foundation.org> - 2015-09-09 01:30 +0200
          Re: linux-next: manual merge of the akpm-current tree with the tip tree Geert Uytterhoeven <geert@linux-m68k.org> - 2015-09-16 09:00 +0200

csiph-web