mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andre Przywara <andre.przywara@arm.com>
To: Andrea Arcangeli <aarcange@redhat.com>,
	Shuah Khan <shuahkh@osg.samsung.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-api@vger.kernel.org, linux-kernel@vger.kernel.org,
	Pavel Emelyanov <xemul@parallels.com>
Subject: [PATCH 2/2] selftests/userfaultfd: improve syscall number definition
Date: Tue, 22 Sep 2015 11:45:56 +0100	[thread overview]
Message-ID: <1442918756-17892-3-git-send-email-andre.przywara@arm.com> (raw)
In-Reply-To: <1442918756-17892-1-git-send-email-andre.przywara@arm.com>

At the moment the userfaultfd test program only supports x86 and an
architecture called "powewrpc" ;-)
Fix that typo and add the syscall numbers for other architectures as
well.
Also as in an ideal world a syscall number should come from the system
header file <asm/unistd.h>, include that header and guard the explicit
syscall number section below to avoid redefinitions.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 tools/testing/selftests/vm/userfaultfd.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 2c7cca6..63be27f 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -65,16 +65,27 @@
 #include <sys/ioctl.h>
 #include <pthread.h>
 #include "../../../../include/uapi/linux/userfaultfd.h"
+#include <asm/unistd.h>
 
+/* ideally the above user header provides that number, but ... */
+#ifndef __NR_userfaultfd
 #ifdef __x86_64__
 #define __NR_userfaultfd 323
 #elif defined(__i386__)
 #define __NR_userfaultfd 374
-#elif defined(__powewrpc__)
+#elif defined(__powerpc__)
 #define __NR_userfaultfd 364
+#elif defined(__ia64__)
+#define __NR_userfaultfd 1343
+#elif defined(__arm__)
+#define __NR_userfaultfd 388
+#elif defined(__aarch64__)
+/* this is from the generic syscall table, used also on other architectures */
+#define __NR_userfaultfd 283
 #else
 #error "missing __NR_userfaultfd definition"
 #endif
+#endif /* !__NR_userfaultfd */
 
 static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size;
 
-- 
2.5.1


  parent reply	other threads:[~2015-09-22 10:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-22 10:45 [PATCH 0/2] selftests/userfaultfd: fix build Andre Przywara
2015-09-22 10:45 ` [PATCH 1/2] userfaultfd: remove kernel header include from uapi header Andre Przywara
2015-09-22 10:45 ` Andre Przywara [this message]
2015-09-22 13:49   ` [PATCH 2/2] selftests/userfaultfd: improve syscall number definition Shuah Khan
2015-09-22 14:06     ` Andrea Arcangeli
2015-09-22 17:15       ` Andre Przywara
2015-09-23  9:55         ` Michael Ellerman
2015-09-23 13:11           ` Andre Przywara
2015-09-24  2:04             ` Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442918756-17892-3-git-send-email-andre.przywara@arm.com \
    --to=andre.przywara@arm.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shuahkh@osg.samsung.com \
    --cc=xemul@parallels.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome