From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwULG-0006GX-5q for qemu-devel@nongnu.org; Tue, 18 Oct 2016 09:22:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwULE-0000f2-Oq for qemu-devel@nongnu.org; Tue, 18 Oct 2016 09:22:06 -0400 Received: from mail-lf0-x232.google.com ([2a00:1450:4010:c07::232]:35937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bwULE-0000eX-Gt for qemu-devel@nongnu.org; Tue, 18 Oct 2016 09:22:04 -0400 Received: by mail-lf0-x232.google.com with SMTP id b75so346721477lfg.3 for ; Tue, 18 Oct 2016 06:22:04 -0700 (PDT) From: riku.voipio@linaro.org Date: Tue, 18 Oct 2016 16:21:36 +0300 Message-Id: <7ff289e741b3ad6cc77b248e82afcede8c246180.1476796525.git.riku.voipio@linaro.org> In-Reply-To: References: Subject: [Qemu-devel] [PULL v2 08/22] linux-user: sparc64: Use correct target SHMLBA in shmat() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Peter Maydell 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 b7e3bf8..2cbbaae 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 */ -- 2.1.4