| Message ID | 1394456357-8739-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, Mar 10, 2014 at 12:59:17PM +0000, Peter Maydell wrote: > 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. Looks good, Reviewed-by: Riku Voipio <riku.voipio@linaro.org> > Reported-by: Amanieu d'Antras <amanieu@gmail.com> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > 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
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()
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> --- linux-user/elfload.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)