Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-4
+2
-4
drivers/firmware/efi/libstub/zboot.lds
+2
-4
drivers/firmware/efi/libstub/zboot.lds
···
29
29
. = _etext;
30
30
}
31
31
32
-
#ifdef CONFIG_EFI_SBAT
33
32
.sbat : ALIGN(4096) {
34
33
_sbat = .;
35
34
*(.sbat)
36
35
_esbat = ALIGN(4096);
37
36
. = _esbat;
38
37
}
39
-
#endif
40
38
41
39
.data : ALIGN(4096) {
42
40
_data = .;
···
58
60
PROVIDE(__efistub__gzdata_size =
59
61
ABSOLUTE(__efistub__gzdata_end - __efistub__gzdata_start));
60
62
61
-
PROVIDE(__data_rawsize = ABSOLUTE(_edata - _etext));
62
-
PROVIDE(__data_size = ABSOLUTE(_end - _etext));
63
+
PROVIDE(__data_rawsize = ABSOLUTE(_edata - _data));
64
+
PROVIDE(__data_size = ABSOLUTE(_end - _data));
63
65
PROVIDE(__sbat_size = ABSOLUTE(_esbat - _sbat));