diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-01-06 20:25:59 -0800 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2022-01-11 18:40:44 +0100 |
| commit | ffe81d439812b2858065bb1410551027eafe938b (patch) | |
| tree | 107ae1d2c6319d78c6e612bd63df15cbfcd32a84 | |
| parent | 2dd4634963224834d79221718e95987c7d351290 (diff) | |
| download | focaccia-qemu-ffe81d439812b2858065bb1410551027eafe938b.tar.gz focaccia-qemu-ffe81d439812b2858065bb1410551027eafe938b.zip | |
linux-user/arm: Move target_oabi_flock64 out of target_structs.h
Place it next to copy_from/to_user_oabi_flock64, the only users, inside the existing target-specific ifdef. This leaves only generic ipc structs in target_structs.h. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20220107042600.149852-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/arm/target_structs.h | 8 | ||||
| -rw-r--r-- | linux-user/syscall.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h index 339b070bf1..25bf8dd3a5 100644 --- a/linux-user/arm/target_structs.h +++ b/linux-user/arm/target_structs.h @@ -48,12 +48,4 @@ struct target_shmid_ds { abi_ulong __unused4; abi_ulong __unused5; }; - -struct target_oabi_flock64 { - abi_short l_type; - abi_short l_whence; - abi_llong l_start; - abi_llong l_len; - abi_int l_pid; -} QEMU_PACKED; #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ce9d64896c..ca6e0b8fb0 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6927,6 +6927,14 @@ typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr); typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl); #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32 +struct target_oabi_flock64 { + abi_short l_type; + abi_short l_whence; + abi_llong l_start; + abi_llong l_len; + abi_int l_pid; +} QEMU_PACKED; + static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, abi_ulong target_flock_addr) { |