From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757870AbbIVKoz (ORCPT ); Tue, 22 Sep 2015 06:44:55 -0400 Received: from foss.arm.com ([217.140.101.70]:57261 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757506AbbIVKow (ORCPT ); Tue, 22 Sep 2015 06:44:52 -0400 From: Andre Przywara To: Andrea Arcangeli , Shuah Khan Cc: Andrew Morton , linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Emelyanov Subject: [PATCH 2/2] selftests/userfaultfd: improve syscall number definition Date: Tue, 22 Sep 2015 11:45:56 +0100 Message-Id: <1442918756-17892-3-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1442918756-17892-1-git-send-email-andre.przywara@arm.com> References: <1442918756-17892-1-git-send-email-andre.przywara@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 , include that header and guard the explicit syscall number section below to avoid redefinitions. Signed-off-by: Andre Przywara --- 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 #include #include "../../../../include/uapi/linux/userfaultfd.h" +#include +/* 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