From patchwork Fri Feb 19 13:42:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 8361241 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 00593C0553 for ; Fri, 19 Feb 2016 13:46:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3ABAE20461 for ; Fri, 19 Feb 2016 13:46:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A04B2045B for ; Fri, 19 Feb 2016 13:46:49 +0000 (UTC) Received: from localhost ([::1]:52430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlOS-00078N-Tv for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 08:46:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlKe-0000Xj-60 for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWlKd-0004do-0x for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:52 -0500 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:35164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlKc-0004dU-KM for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:50 -0500 Received: by mail-lf0-x233.google.com with SMTP id l143so54024044lfe.2 for ; Fri, 19 Feb 2016 05:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LfiwlE/U6lRzVcWRibkfkScvmThC7nmNBknhNWq6yDo=; b=emDuBS9AS5e6sLxW7+iVI7ZmDVs+6JbP3ThapQwgMCwdxUMrXFR8K7JG3HPYyOzkSv ULXfa8BXXPwHMm33y95om7nuL1BO+aCvB/isuKpiMudkWUzq5/hF8ehTeWpQfJksVHLN HqKNRbtzov3PQfGoOeG/NvN1bhkk2Dt0ZORP8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LfiwlE/U6lRzVcWRibkfkScvmThC7nmNBknhNWq6yDo=; b=XB+7paljVRk4ZpEcifUj3oO3e9HspsEZ4j8apnEQ7TQ2poXuPC+JWJIXfmq/kYDS5i iKgBodyoEdgsbN6j9eslGVhEvot27dc1OvF1NnH+zqVlTsbaQXuSpMX5uYcLMtPeTJjO URvhFJEBq40eAAHGSwX21FneQHYnp2BeqNMUgHdauWlMAM02FuMEmyAHkkCP8AelqMr8 7Bj2QT9LdsffifEe7KQmhXZnQJqY5kD0vyMhs3r1Y6gc0+nNhEZvl7ZAHc1KxrjWXdAX C3ti87B9BxXf2/TAhdwjOcREs8d5EDjKPd8vl/tVJ96h/QKf+ELHhk5DMG71p5BOHSaV rPUA== X-Gm-Message-State: AG10YOTtbnnSC+GixyNC+EoqD2xaEb2Kght5ky91RtTXaoI8uDlNYeRr+QRYI3sHOM7ENqRb X-Received: by 10.25.142.201 with SMTP id q192mr4447248lfd.65.1455889369851; Fri, 19 Feb 2016 05:42:49 -0800 (PST) Received: from localhost.localdomain (91-157-175-207.elisa-laajakaista.fi. [91.157.175.207]) by smtp.gmail.com with ESMTPSA id o184sm1557417lfb.15.2016.02.19.05.42.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Feb 2016 05:42:49 -0800 (PST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 15:42:30 +0200 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::233 Cc: Riku Voipio Subject: [Qemu-devel] [PULL 8/8] linux-user: correct timerfd_create syscall numbers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Riku Voipio x86, m68k, ppc, sh4 and sparc failed to enable timerfd, because they didn't have timerfd_create system call defined. Instead QEMU defined timerfd syscall. Checking with kernel sources, it appears kernel developers reused timerfd syscall number with timerfd_create, presumably since no userspace called the old syscall number. Reported-by: Laurent Vivier Reviewed-by: Laurent Vivier Signed-off-by: Riku Voipio --- linux-user/i386/syscall_nr.h | 2 +- linux-user/m68k/syscall_nr.h | 2 +- linux-user/ppc/syscall_nr.h | 2 +- linux-user/sh4/syscall_nr.h | 2 +- linux-user/sparc/syscall_nr.h | 2 +- linux-user/x86_64/syscall_nr.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h index fa3f0b4..bc1bc23 100644 --- a/linux-user/i386/syscall_nr.h +++ b/linux-user/i386/syscall_nr.h @@ -324,7 +324,7 @@ #define TARGET_NR_epoll_pwait 319 #define TARGET_NR_utimensat 320 #define TARGET_NR_signalfd 321 -#define TARGET_NR_timerfd 322 +#define TARGET_NR_timerfd_create 322 #define TARGET_NR_eventfd 323 #define TARGET_NR_fallocate 324 #define TARGET_NR_timerfd_settime 325 diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h index a2daba0..4b50fb2 100644 --- a/linux-user/m68k/syscall_nr.h +++ b/linux-user/m68k/syscall_nr.h @@ -317,7 +317,7 @@ #define TARGET_NR_epoll_pwait 315 #define TARGET_NR_utimensat 316 #define TARGET_NR_signalfd 317 -#define TARGET_NR_timerfd 318 +#define TARGET_NR_timerfd_create 318 #define TARGET_NR_eventfd 319 #define TARGET_NR_fallocate 320 #define TARGET_NR_timerfd_settime 321 diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h index 0a5fd54..46ed8a6 100644 --- a/linux-user/ppc/syscall_nr.h +++ b/linux-user/ppc/syscall_nr.h @@ -319,7 +319,7 @@ #define TARGET_NR_epoll_pwait 303 #define TARGET_NR_utimensat 304 #define TARGET_NR_signalfd 305 -#define TARGET_NR_timerfd 306 +#define TARGET_NR_timerfd_create 306 #define TARGET_NR_eventfd 307 #define TARGET_NR_sync_file_range2 308 #define TARGET_NR_fallocate 309 diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h index bdf8742..5009984 100644 --- a/linux-user/sh4/syscall_nr.h +++ b/linux-user/sh4/syscall_nr.h @@ -323,7 +323,7 @@ #define TARGET_NR_epoll_pwait 319 #define TARGET_NR_utimensat 320 #define TARGET_NR_signalfd 321 -#define TARGET_NR_timerfd 322 +#define TARGET_NR_timerfd_create 322 #define TARGET_NR_eventfd 323 #define TARGET_NR_fallocate 324 #define TARGET_NR_timerfd_settime 325 diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h index 5b582a5..732b105 100644 --- a/linux-user/sparc/syscall_nr.h +++ b/linux-user/sparc/syscall_nr.h @@ -278,7 +278,7 @@ #define TARGET_NR_epoll_pwait 309 #define TARGET_NR_utimensat 310 #define TARGET_NR_signalfd 311 -#define TARGET_NR_timerfd 312 +#define TARGET_NR_timerfd_create 312 #define TARGET_NR_eventfd 313 #define TARGET_NR_fallocate 314 #define TARGET_NR_timerfd_settime 315 diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h index f00fa2b..16397b3 100644 --- a/linux-user/x86_64/syscall_nr.h +++ b/linux-user/x86_64/syscall_nr.h @@ -281,7 +281,7 @@ #define TARGET_NR_utimensat 280 #define TARGET_NR_epoll_pwait 281 #define TARGET_NR_signalfd 282 -#define TARGET_NR_timerfd 283 +#define TARGET_NR_timerfd_create 283 #define TARGET_NR_eventfd 284 #define TARGET_NR_fallocate 285 #define TARGET_NR_timerfd_settime 286