From patchwork Mon Oct 17 13:24:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 77746 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp395212qge; Mon, 17 Oct 2016 06:27:24 -0700 (PDT) X-Received: by 10.55.71.9 with SMTP id u9mr27660171qka.251.1476710843998; Mon, 17 Oct 2016 06:27:23 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r32si17960389qte.1.2016.10.17.06.27.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Oct 2016 06:27:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bw7wp-0004RR-Cg for patch@linaro.org; Mon, 17 Oct 2016 09:27:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bw7uR-00038H-PU for qemu-devel@nongnu.org; Mon, 17 Oct 2016 09:24:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bw7uQ-0003Cr-PP for qemu-devel@nongnu.org; Mon, 17 Oct 2016 09:24:55 -0400 Received: from mail-lf0-x22a.google.com ([2a00:1450:4010:c07::22a]:35970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bw7uQ-0003CJ-Hi for qemu-devel@nongnu.org; Mon, 17 Oct 2016 09:24:54 -0400 Received: by mail-lf0-x22a.google.com with SMTP id b75so288593174lfg.3 for ; Mon, 17 Oct 2016 06:24:54 -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=A3CaVHQJ8szVwiR0wdXfF7U9LyGEMuAVe4rxDstQtBk=; b=TOpFLyy+SHlv2Ghb8zFJQF9wwmGZ93yIi901VQF5UtsyeEOwyVq95cp8xj1+RPmjQ7 aYvLBH/T9GiXALUv8Tx/Vnk8KzPebpKcDEFzJxrqU97+VZIFiF8Sv/OXE4gFkgrTqimJ UjlkKg1pf1SaFBIQAXFq1J357uzxtMeUEzcXk= 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=A3CaVHQJ8szVwiR0wdXfF7U9LyGEMuAVe4rxDstQtBk=; b=Wd3I6Q6R1rc/+h1HjUU8BA0B4aRor59iVty5+TllGq8gCDpVncpRH/4FGprn+rpSxa zOS1aoFV0GrI+YJ33iejotz6QhCrbbxY0V4mlShaT09uzfpAKg3TqWtF8Fe2H/ZVrJDd D3pJY/nCsnOrzfuTO8qWEXllDiQ+Xdu6TaNQpOtL44bi3BAnitHjBBOMhsQw6KaC5/0F yBNGl6rHy4+W+mnLG+QkkYgzfzeJ7jwTHfemPdcT4zX3tTjVsZ261qBCKnW65WjszLx1 sffGHi+nXPdvG2QWfQWKq6ne/Drtr+DA3Zj+lw3GglLXJhVwL4RDnfr3/oqPB9/9hA4w 5J7A== X-Gm-Message-State: AA6/9RlYlsBdFH76g62zUyCwqJHT3wwvTvgpTML3jH8t3bfMgRBdpU0LAWDDTR/lRwC3fdUd X-Received: by 10.25.72.82 with SMTP id v79mr1916387lfa.130.1476710692936; Mon, 17 Oct 2016 06:24:52 -0700 (PDT) Received: from beaming.home (91-157-170-157.elisa-laajakaista.fi. [91.157.170.157]) by smtp.gmail.com with ESMTPSA id y81sm7782857lff.29.2016.10.17.06.24.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 06:24:52 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 17 Oct 2016 16:24:26 +0300 Message-Id: <2abb1e13dd4cb9d914fed8c09fd01482dfb206b4.1476710353.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::22a Subject: [Qemu-devel] [PULL 08/22] linux-user: sparc64: Use correct target SHMLBA in shmat() 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(+) -- 2.1.4 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 */