diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-03 08:57:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-03 08:57:05 -0800 |
| commit | 89401be6580eab6419bab1f553144131e7a335dc (patch) | |
| tree | 98a0d54ba9bacb181772d4aca988a88ebbb42be5 | |
| parent | 312b3a93dda6db9354b0c6b0f1868c1434e8c787 (diff) | |
| parent | 74c953ca5f6b4d5f1daa1ef34f4317e15c1a2987 (diff) | |
| download | linux-89401be6580eab6419bab1f553144131e7a335dc.tar.gz linux-89401be6580eab6419bab1f553144131e7a335dc.tar.bz2 linux-89401be6580eab6419bab1f553144131e7a335dc.zip | |
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
| -rw-r--r-- | drivers/firmware/efi/arm-runtime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 23ea1ed409d1..352bd2473162 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -37,8 +37,9 @@ extern u64 efi_system_table; static struct ptdump_info efi_ptdump_info = { .mm = &efi_mm, .markers = (struct addr_marker[]){ - { 0, "UEFI runtime start" }, - { DEFAULT_MAP_WINDOW_64, "UEFI runtime end" } + { 0, "UEFI runtime start" }, + { DEFAULT_MAP_WINDOW_64, "UEFI runtime end" }, + { -1, NULL } }, .base_addr = 0, }; |