From a7c65cbfe707aba92511bd63540a2be069bf9ffc Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 4 Oct 2016 14:13:46 +0100 Subject: [PATCH] linux-user: sparc64: Use correct target SHMLBA in shmat() In commit 40df8c0c0722 support was added for target-specific handling of SHMLBA. Unfortunately the sparc64-specific part of the change got lost somewhere between the patch being posted to the list and going into master: http://patchwork.ozlabs.org/patch/646980/ http://patchwork.ozlabs.org/patch/673339/ Add the accidentally-dropped code. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/sparc64/target_syscall.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h index b7e3bf82fb..2cbbaaed1b 100644 --- a/linux-user/sparc64/target_syscall.h +++ b/linux-user/sparc64/target_syscall.h @@ -23,4 +23,11 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 +#define TARGET_FORCE_SHMLBA + +static inline abi_ulong target_shmlba(CPUSPARCState *env) +{ + return MAX(TARGET_PAGE_SIZE, 16 * 1024); +} + #endif /* SPARC64_TARGET_SYSCALL_H */