On Mon, 27 Mar 2023 at 15:30, Leif Lindholm <quic_llind...@quicinc.com> wrote: > > On Mon, Mar 27, 2023 at 13:01:10 +0200, Ard Biesheuvel wrote: > > UEFI v2.10 introduces a new flag to the memory attributes table to > > inform the OS whether or not runtime services code regions were emitted > > by the compiler with guard instructions for forward edge control flow > > integrity enforcement. > > > > So update our definition accordingly. > > > > Link: > > https://uefi.org/specs/UEFI/2.10/04_EFI_System_Table.html#efi-memory-attributes-table > > Signed-off-by: Ard Biesheuvel <a...@kernel.org> > > Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com> > > Acked-by: Michael Kubacki <michael.kuba...@microsoft.com> > > --- > > MdePkg/Include/Guid/MemoryAttributesTable.h | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/MdePkg/Include/Guid/MemoryAttributesTable.h > > b/MdePkg/Include/Guid/MemoryAttributesTable.h > > index 82f83a67b96d38c5..238c14ff92dfed31 100644 > > --- a/MdePkg/Include/Guid/MemoryAttributesTable.h > > +++ b/MdePkg/Include/Guid/MemoryAttributesTable.h > > @@ -17,11 +17,15 @@ typedef struct { > > UINT32 Version; > > UINT32 NumberOfEntries; > > UINT32 DescriptorSize; > > - UINT32 Reserved; > > + UINT32 Flags; > > Does this not cause a bisect breakage vs patch 17? >
Yeah, rebase error - this change should update the reference to Reserved as well in MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c, and patch 17/17 should only change the value that gets assigned to it. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#102130): https://edk2.groups.io/g/devel/message/102130 Mute This Topic: https://groups.io/mt/97879302/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
