mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 27 Feb 2018 13:55:35 -0500
|
|
Subject: [PATCH] align struct efi_variable better...
|
|
|
|
---
|
|
include/grub/efiemu/runtime.h | 2 +-
|
|
include/grub/types.h | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
|
|
index 36d2dedf47e..9d93ba88bac 100644
|
|
--- a/include/grub/efiemu/runtime.h
|
|
+++ b/include/grub/efiemu/runtime.h
|
|
@@ -33,5 +33,5 @@ struct efi_variable
|
|
grub_uint32_t namelen;
|
|
grub_uint32_t size;
|
|
grub_efi_uint32_t attributes;
|
|
-} GRUB_PACKED;
|
|
+} GRUB_PACKED GRUB_ALIGNED(8);
|
|
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
|
|
diff --git a/include/grub/types.h b/include/grub/types.h
|
|
index b93e4820194..f6a9723971d 100644
|
|
--- a/include/grub/types.h
|
|
+++ b/include/grub/types.h
|
|
@@ -29,6 +29,7 @@
|
|
#else
|
|
#define GRUB_PACKED __attribute__ ((packed))
|
|
#endif
|
|
+#define GRUB_ALIGNED(x) __attribute__((aligned (x)))
|
|
|
|
#ifdef GRUB_BUILD
|
|
# define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P
|