Commit eadb9fa7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-fixes-for-v6.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fixes from Ard Biesheuvel:

 - Drop preprocessor macros in zboot.lds which is not preprocessed

 - Fix zboot .data section size and raw size when SBAT is enabled

* tag 'efi-fixes-for-v6.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Fix .data section size calculations when .sbat is present
  efi: Drop preprocessor directives from zboot.lds
parents 6e9128ff f8b53cc9

drivers/firmware/efi/libstub/zboot.lds

+2 −4
Original line number Diff line number Diff line
@@ -29,14 +29,12 @@ SECTIONS 
		. = _etext;

	}



#ifdef CONFIG_EFI_SBAT

        .sbat : ALIGN(4096) {

		_sbat = .;

		*(.sbat)

		_esbat = ALIGN(4096);

		. = _esbat;

	}

#endif



	.data : ALIGN(4096) {

		_data = .;
@@ -60,6 +58,6 @@ SECTIONS 
PROVIDE(__efistub__gzdata_size =

		ABSOLUTE(__efistub__gzdata_end - __efistub__gzdata_start));



PROVIDE(__data_rawsize = ABSOLUTE(_edata - _etext));

PROVIDE(__data_size = ABSOLUTE(_end - _etext));

PROVIDE(__data_rawsize = ABSOLUTE(_edata - _data));

PROVIDE(__data_size = ABSOLUTE(_end - _data));

PROVIDE(__sbat_size = ABSOLUTE(_esbat - _sbat));