diff mbox

linux-user: Fix sync_file_range on 32bit mips

Message ID BANLkTinAEfdkVR6L+25rHTWQ4p+PKxXZ0Q@mail.gmail.com
State Accepted
Headers show

Commit Message

Riku Voipio June 23, 2011, 3:47 p.m. UTC
diff mbox

Patch

From d19bb3509bd2b81568a850f579008080287ffe95 Mon Sep 17 00:00:00 2001
Message-Id: <d19bb3509bd2b81568a850f579008080287ffe95.1308583801.git.riku.voipio@iki.fi>
In-Reply-To: <cover.1308583801.git.riku.voipio@iki.fi>
References: <cover.1308583801.git.riku.voipio@iki.fi>
From: Riku Voipio <riku.voipio@iki.fi>
Date: Mon, 20 Jun 2011 16:24:39 +0300
Subject: [PATCH 18/18] linux-user: Fix sync_file_range on 32bit mips

As noticed while looking at "Bump do_syscall() up to 8 syscall arguments"
patch, sync_file_range uses a pad argument on 32bit mips. Deal with it
by reading the correct arguments when on mips.

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
---
 linux-user/syscall.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index aa11a2c..beb482c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7842,8 +7842,13 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #if defined(TARGET_NR_sync_file_range)
     case TARGET_NR_sync_file_range:
 #if TARGET_ABI_BITS == 32
+#if defined(TARGET_MIPS)
+        ret = get_errno(sync_file_range(arg1, target_offset64(arg3, arg4),
+                                        target_offset64(arg5, arg6), arg7));
+#else
         ret = get_errno(sync_file_range(arg1, target_offset64(arg2, arg3),
                                         target_offset64(arg4, arg5), arg6));
+#endif /* !TARGET_MIPS */
 #else
         ret = get_errno(sync_file_range(arg1, arg2, arg3, arg4));
 #endif
-- 
1.7.4.1