From patchwork Tue Jul 19 12:54:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 9237147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8AA0B6075D for ; Tue, 19 Jul 2016 13:04:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A3E126B4A for ; Tue, 19 Jul 2016 13:04:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ACC126D08; Tue, 19 Jul 2016 13:04:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 6936626B4A for ; Tue, 19 Jul 2016 13:04:11 +0000 (UTC) Received: from localhost ([::1]:55727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUh0-0000BN-Gt for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jul 2016 09:04:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUXo-0007nU-9i for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:54:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPUXm-0003Qa-FG for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:54:39 -0400 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]:33715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUXm-0003QO-7N for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:54:38 -0400 Received: by mail-lf0-x22b.google.com with SMTP id b199so13476202lfe.0 for ; Tue, 19 Jul 2016 05:54:38 -0700 (PDT) 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=E9sSXk0LhQMvM34dFpra3Mg1pAoaPdhHRXpDxiZd2oY=; b=S4pvPyuwqI+8mvYV0hwlwLLiP4JQhfq/nOrhKXp9cZ93JVsFXVgtUP0qs9VgA7dflM TjiByXMdRdvgDAMx0IsHBUeRE/6c7D78AToFVntSEWH0Ext8mHPWcDDUvRZDKb2ZX/A5 yoRE7m4IGIEVepmgT3OZ75a3pOnjG+9jPYXaA= 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=E9sSXk0LhQMvM34dFpra3Mg1pAoaPdhHRXpDxiZd2oY=; b=M5Ayw4hOkUl2YrJ3LnG9CCj7Tp1uNEpZcmlHwaXZGrlSs0tZAuZsBz9UJyTeIbNgbx cndzU7BTayPnl7hOJCxkwkuj5pld8H4tVOwH5y0eLQICwj3W06vOe0Sbc6bo0XPyNqik qdZqoq+z07LeMBhlCCTZi09oRzo8E6zNhCJDXihnjrM0w099yu6ud2ZmSM/binlUWbIL OUlbAFTNkGGGtR73LFLVsXxLe+grt7qdxsoE18PHSVnzxebC/gjvgXhBXREEywsAGMDJ YWhYlH483m3Id2MtEn+3qB1v3BrtWXcdsONhXWFYkmmQ/zY1QXKfPFV44t8D89/AgNKe +FCg== X-Gm-Message-State: ALyK8tJCJ9I89IEVPcEfCTBWb7la6nEGSRtwvtQo3spMbCmc8QzaLDJaGj4z2cJI7vzRXEKK X-Received: by 10.46.0.201 with SMTP id e70mr13068751lji.57.1468932877237; Tue, 19 Jul 2016 05:54:37 -0700 (PDT) Received: from beaming.home (91-157-170-157.elisa-laajakaista.fi. [91.157.170.157]) by smtp.gmail.com with ESMTPSA id g3sm2248898lfe.14.2016.07.19.05.54.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jul 2016 05:54:36 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Tue, 19 Jul 2016 15:54:14 +0300 Message-Id: <29b9f30b1e3a158e0127c45ade959b7d943cf8f8.1468932683.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:c07::22b Subject: [Qemu-devel] [PULL 16/16] linux-user: AArch64 has sync_file_range, not sync_file_range2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Maydell The AArch64 Linux ABI syscall 84 is sync_file_range, not sync_file_range2 (in the kernel it uses the asm-generic headers and does not define __ARCH_WANT_SYNC_FILE_RANGE2). Update our TARGET_NR_* definitions accordingly. This fixes the sync_file_range syscall which otherwise gets its arguments in the wrong order. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/aarch64/syscall_nr.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux-user/aarch64/syscall_nr.h b/linux-user/aarch64/syscall_nr.h index 59511d8..a3c9a3b 100644 --- a/linux-user/aarch64/syscall_nr.h +++ b/linux-user/aarch64/syscall_nr.h @@ -86,8 +86,7 @@ #define TARGET_NR_sync 81 #define TARGET_NR_fsync 82 #define TARGET_NR_fdatasync 83 -#define TARGET_NR_sync_file_range2 84 -/* #define TARGET_NR_sync_file_range 84 */ +#define TARGET_NR_sync_file_range 84 #define TARGET_NR_timerfd_create 85 #define TARGET_NR_timerfd_settime 86 #define TARGET_NR_timerfd_gettime 87