From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMznd-000810-Mw for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMznc-0003nR-Rr for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:59:21 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMznc-0003nH-L0 for qemu-devel@nongnu.org; Mon, 10 Mar 2014 08:59:20 -0400 From: Peter Maydell Date: Mon, 10 Mar 2014 12:59:17 +0000 Message-Id: <1394456357-8739-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] linux-user: Don't reserve space for commpage for AArch64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , patches@linaro.org 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 --- 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() -- 1.9.0