From 16e513170ae0bf8cf5e83117abbeff11a7653fc4 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Thu, 11 Apr 2024 22:50:24 +0530 Subject: [PATCH] 6.8.5 --- ...i-libstub-add-support-for-the-apple_set_os-protoco.patch | 6 +++--- version | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2010-efi-libstub-add-support-for-the-apple_set_os-protoco.patch b/2010-efi-libstub-add-support-for-the-apple_set_os-protoco.patch index c2bae13..1ef0d5b 100644 --- a/2010-efi-libstub-add-support-for-the-apple_set_os-protoco.patch +++ b/2010-efi-libstub-add-support-for-the-apple_set_os-protoco.patch @@ -49,19 +49,19 @@ index bfa30625f..3d99acc1a 100644 + efi_apple_set_os = true; } else if (IS_ENABLED(CONFIG_X86_64) && !strcmp(param, "no5lvl")) { efi_no5lvl = true; - } else if (!strcmp(param, "efi") && val) { + } else if (IS_ENABLED(CONFIG_ARCH_HAS_MEM_ENCRYPT) && diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 212687c30..21b414d09 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h @@ -38,6 +38,7 @@ extern bool efi_nochunk; - extern bool efi_nokaslr; extern int efi_loglevel; + extern int efi_mem_encrypt; extern bool efi_novamap; +extern bool efi_apple_set_os; - extern const efi_system_table_t *efi_system_table; + typedef union efi_dxe_services_table efi_dxe_services_table_t; @@ -825,6 +826,19 @@ union apple_properties_protocol { } mixed_mode; }; diff --git a/version b/version index 8b01b19..deed594 100644 --- a/version +++ b/version @@ -1 +1 @@ -KVER=6.8.4 +KVER=6.8.5