From patchwork Thu Feb 25 11:01:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 8422541 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 6144DC0553 for ; Thu, 25 Feb 2016 11:06:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7AB72025B for ; Thu, 25 Feb 2016 11:06:51 +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 332F620251 for ; Thu, 25 Feb 2016 11:06:51 +0000 (UTC) Received: from localhost ([::1]:42195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtkw-0004kR-Iy for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Feb 2016 06:06:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtfn-0005Ah-JC for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:01:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYtfj-0000dJ-Mt for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:01:31 -0500 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:35613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtfj-0000dB-AJ for qemu-devel@nongnu.org; Thu, 25 Feb 2016 06:01:27 -0500 Received: by mail-lb0-x22a.google.com with SMTP id bc4so26712737lbc.2 for ; Thu, 25 Feb 2016 03:01:27 -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=MngcpqNTIjgMz+i88R2t1u+nc/j7gyfbkVgR8owwEIU=; b=DeuNxGezGRA49DtpuDNp0/P3i+ONnzn3a41XQ4cyLBKdaS4fXzwszClHBDae3ODFFx Wd8dVfHefTOmkEnzvbMJYiFm2Iq79jBXTarbcmI86YqSecLtKKYhi9m5n/8tLoX9Knbh i4bx9zBPcr5L9Hq7Ib8n63wkCI1w6IfHQVdXA= 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=MngcpqNTIjgMz+i88R2t1u+nc/j7gyfbkVgR8owwEIU=; b=HO+jNVTa1Sr0OkIKd69d48VovkHGOBj0v/AIWHAhVkyZyYOQsmEVlzZgtkqkQI6mJC hi26R7A911AikVysMmOlI5M4i4n5tXqzNLfBCu7BE/i5/2F4jFlvkCH0OPwtDf182Ayx 6nK420TXFa4cMVvwolLlZvkBbAjGYuAgEpPywt6gIvmDhFQXj2GD4COqdz2k0CReWeaB OMyBDaJDoWTKL/WXTHdn1nAprbIBqDe3wqoTkZg2pxCiLoJ0AB+AgPFNx4SXGJJqosmW MKmQZG4cukP/nT7AHhKUxldkIoK8bJImeAByKdMpK3fyGAWVlmr6vFYkflRhPuxGiLC2 Gg/A== X-Gm-Message-State: AG10YOSVbkaTjZt56zZxBzi92fiHplQa60f/xdyTARX0BQJOIYK0NzF1gk3EUcCce8fWP9B+ X-Received: by 10.112.202.104 with SMTP id kh8mr12610318lbc.8.1456398086475; Thu, 25 Feb 2016 03:01:26 -0800 (PST) Received: from beaming.home (91-157-175-207.elisa-laajakaista.fi. [91.157.175.207]) by smtp.gmail.com with ESMTPSA id f184sm1066803lfe.6.2016.02.25.03.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Feb 2016 03:01:25 -0800 (PST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2016 13:01:12 +0200 Message-Id: <93a92d3bd649cd315db47b9fb5dcb6af657cc22c.1456397907.git.riku.voipio@linaro.org> X-Mailer: git-send-email 2.1.4 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:c04::22a Cc: Riku Voipio Subject: [Qemu-devel] [PULL v2 7/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=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, UNPARSEABLE_RELAY autolearn=no 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