diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-06 19:39:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-06 19:39:36 +0300 |
| commit | a34adf6010d723abc26c9f50ac2b326bf5ae0b9e (patch) | |
| tree | 7fdc774c95a9afbfa8e33ec32194d2b6988f3601 /drivers/firmware/efi/libstub | |
| parent | 2df0193e62cf887f373995fb8a91068562784adc (diff) | |
| parent | 99280413a5b785f22d91e8a8a66dc38f4a214495 (diff) | |
| download | linux-a34adf6010d723abc26c9f50ac2b326bf5ae0b9e.tar.xz | |
Merge tag 'efi-fixes-for-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
- Ensure that .discard sections are really discarded in the EFI zboot
image build
- Return proper error numbers from efi-pstore
- Add __nocfi annotations to EFI runtime wrappers
* tag 'efi-fixes-for-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: Add missing __nocfi annotations to runtime wrappers
efi: pstore: Return proper errors on UEFI failures
efi/libstub: zboot.lds: Discard .discard sections
Diffstat (limited to 'drivers/firmware/efi/libstub')
| -rw-r--r-- | drivers/firmware/efi/libstub/zboot.lds | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/efi/libstub/zboot.lds b/drivers/firmware/efi/libstub/zboot.lds index ac8c0ef85158..af2c82f7bd90 100644 --- a/drivers/firmware/efi/libstub/zboot.lds +++ b/drivers/firmware/efi/libstub/zboot.lds @@ -41,6 +41,7 @@ SECTIONS } /DISCARD/ : { + *(.discard .discard.*) *(.modinfo .init.modinfo) } } |