From patchwork Mon Mar 10 12:59:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25967 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C29D32055F for ; Mon, 10 Mar 2014 12:59:22 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf18578219pad.7 for ; Mon, 10 Mar 2014 05:59:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=OEWBXfxx5c+mp8UieqF1dTrGi7WM+f/vR07tMPFYntE=; b=KZASv5Yw3Vr1xUdMc4ptvJ4YrLmwXsf6SsKXxS6Wue0Sgbe90fiT+kuthoXrhl0gEv aUST2CRLqVGYSZkqyGbuD7ye2Ve/uPafuHSf6W0X+NuV8aFxu9qYLz4niUxTOnWayXmx 3nBRTcY4GXza3X96yNTIfAeKBMrGZ8HcnRxuiEeo9d5geyPWmJbef1UtD29/UQB5VOjs RE7dNa1jf6MY4XYMv8j3UEaoCWJrJZkldLKdfDCQ3D7oIPMLxFbPoqb/iph1qYMsCSn9 iBELad5z8rlIfFnDkSag1ms2A7adV40ZT0isGzTlC8ir+pwkOGhHGKAF+XJ65TkCAH9H EtKw== X-Gm-Message-State: ALoCoQlzlEsNQ7lw3+HpjRhIIxNT9rF5x7lqN7gOMBoRUbt48/osSA+2HvcH3eBwZKVI8SSFPiOX X-Received: by 10.68.196.195 with SMTP id io3mr14163658pbc.7.1394456361070; Mon, 10 Mar 2014 05:59:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.38 with SMTP id n35ls2093836qga.68.gmail; Mon, 10 Mar 2014 05:59:20 -0700 (PDT) X-Received: by 10.52.50.178 with SMTP id d18mr48518vdo.53.1394456360926; Mon, 10 Mar 2014 05:59:20 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id kp12si4689069veb.88.2014.03.10.05.59.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Mar 2014 05:59:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so1167734vcb.25 for ; Mon, 10 Mar 2014 05:59:20 -0700 (PDT) X-Received: by 10.58.200.229 with SMTP id jv5mr22352868vec.15.1394456360794; Mon, 10 Mar 2014 05:59:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.78.9 with SMTP id i9csp116725vck; Mon, 10 Mar 2014 05:59:20 -0700 (PDT) X-Received: by 10.180.72.239 with SMTP id g15mr8869995wiv.45.1394456359854; Mon, 10 Mar 2014 05:59:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id hy4si18269865wjb.102.2014.03.10.05.59.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 10 Mar 2014 05:59:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WMznZ-0002HQ-Vp; Mon, 10 Mar 2014 12:59:18 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio Subject: [PATCH] linux-user: Don't reserve space for commpage for AArch64 Date: Mon, 10 Mar 2014 12:59:17 +0000 Message-Id: <1394456357-8739-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , AArch64 Linux, unlike AArch32, doesn't use a commpage. This means we should not be reserving room in the guest address space for one. Fixes LP:1287195. Reported-by: Amanieu d'Antras Signed-off-by: Peter Maydell Reviewed-by: Riku Voipio --- linux-user/elfload.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c0687e3..cabfc14 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -352,6 +352,9 @@ enum ARM_HWCAP_ARM_VFPv3D16 = 1 << 13, }; +#ifndef TARGET_AARCH64 +/* The commpage only exists for 32 bit kernels */ + #define TARGET_HAS_VALIDATE_GUEST_SPACE /* Return 1 if the proposed guest space is suitable for the guest. * Return 0 if the proposed guest space isn't suitable, but another @@ -411,7 +414,7 @@ static int validate_guest_space(unsigned long guest_base, return 1; /* All good */ } - +#endif #define ELF_HWCAP get_elf_hwcap()