Commit 89401be6 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull EFI fix from Thomas Gleixner:
 "The dump info for the efi page table debugging lacks a terminator
  which causes the kernel to crash when the debugfile is read"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/arm64: Fix debugfs crash by adding a terminator for ptdump marker
parents 312b3a93 74c953ca
...@@ -37,8 +37,9 @@ extern u64 efi_system_table; ...@@ -37,8 +37,9 @@ extern u64 efi_system_table;
static struct ptdump_info efi_ptdump_info = { static struct ptdump_info efi_ptdump_info = {
.mm = &efi_mm, .mm = &efi_mm,
.markers = (struct addr_marker[]){ .markers = (struct addr_marker[]){
{ 0, "UEFI runtime start" }, { 0, "UEFI runtime start" },
{ DEFAULT_MAP_WINDOW_64, "UEFI runtime end" } { DEFAULT_MAP_WINDOW_64, "UEFI runtime end" },
{ -1, NULL }
}, },
.base_addr = 0, .base_addr = 0,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment