81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001
|
|
From: Julien Grall <julien.grall@linaro.org>
|
|
Date: Fri, 19 Feb 2016 16:28:52 +0000
|
|
Subject: [PATCH 038/206] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64
|
|
|
|
Xen is currently crashing because of malformed compatible property for
|
|
the boot module. This is because the property string is not
|
|
null-terminated as requested by the ePAR spec.
|
|
|
|
Signed-off-by: Julien Grall <julien.grall@linaro.org>
|
|
Tested-by: Fu Wei <fu.wei@linaro.org>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/loader/arm64/xen_boot.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
|
|
index a914eb8e2df..8ae43d7e894 100644
|
|
--- a/grub-core/loader/arm64/xen_boot.c
|
|
+++ b/grub-core/loader/arm64/xen_boot.c
|
|
@@ -156,7 +156,7 @@ prepare_xen_module_params (struct xen_boot_binary *module, void *xen_boot_fdt)
|
|
grub_fdt_add_subnode (xen_boot_fdt, chosen_node, module_name);
|
|
|
|
retval = grub_fdt_set_prop (xen_boot_fdt, module_node, "compatible",
|
|
- MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE) - 1);
|
|
+ MODULE_CUSTOM_COMPATIBLE, sizeof(MODULE_CUSTOM_COMPATIBLE));
|
|
if (retval)
|
|
return grub_error (GRUB_ERR_IO, "failed to update FDT");
|
|
|
|
--
|
|
2.15.0
|
|
|