Skip to content

Commit 394415a

Browse files
committed
6.6.26
1 parent 1846c81 commit 394415a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

2010-efi-libstub-add-support-for-the-apple_set_os-protoco.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ index bfa30625f..3d99acc1a 100644
4949
+ efi_apple_set_os = true;
5050
} else if (IS_ENABLED(CONFIG_X86_64) && !strcmp(param, "no5lvl")) {
5151
efi_no5lvl = true;
52-
} else if (!strcmp(param, "efi") && val) {
52+
} else if (IS_ENABLED(CONFIG_ARCH_HAS_MEM_ENCRYPT) &&
5353
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
5454
index 212687c30..21b414d09 100644
5555
--- a/drivers/firmware/efi/libstub/efistub.h
5656
+++ b/drivers/firmware/efi/libstub/efistub.h
5757
@@ -38,6 +38,7 @@ extern bool efi_nochunk;
58-
extern bool efi_nokaslr;
5958
extern int efi_loglevel;
59+
extern int efi_mem_encrypt;
6060
extern bool efi_novamap;
6161
+extern bool efi_apple_set_os;
62-
6362
extern const efi_system_table_t *efi_system_table;
6463

64+
typedef union efi_dxe_services_table efi_dxe_services_table_t;
6565
@@ -825,6 +826,19 @@ union apple_properties_protocol {
6666
} mixed_mode;
6767
};

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
KVER=6.6.24
1+
KVER=6.6.26

0 commit comments

Comments
 (0)