aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-10 12:59:17 +0000
committerRiku Voipio <riku.voipio@linaro.org>2014-03-17 11:44:31 +0200
commit6b1275ff15b205a7738aa8ba96fe355f097b5879 (patch)
tree04a24827e63aaef3bda4c236fe430903193ded03 /linux-user
parent8d5d30046b9aadfeee60e09fe79c063f419993db (diff)
downloadqemu-arm-6b1275ff15b205a7738aa8ba96fe355f097b5879.tar.gz
linux-user: Don't reserve space for commpage for AArch64
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 <amanieu@gmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/elfload.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 6bc799957b..99a2c586eb 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()