diff options
| author | Tejun Heo | 2018-12-28 03:05:30 +0100 |
|---|---|---|
| committer | Tejun Heo | 2018-12-28 03:05:30 +0100 |
| commit | 4d71c6f8771a6bccb844244f09831fa4624b22c1 (patch) | |
| tree | 9c6fdf753d64c839a4b0deb7d35d7e990c8e9971 /drivers/firmware/efi/libstub | |
| parent | cpuset: Remove set but not used variable 'cs' (diff) | |
| parent | cgroup: fix CSS_TASK_ITER_PROCS (diff) | |
| download | kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.gz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.xz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.zip | |
Merge branch 'for-4.20-fixes' into for-4.21
Diffstat (limited to 'drivers/firmware/efi/libstub')
| -rw-r--r-- | drivers/firmware/efi/libstub/arm-stub.c | 3 | ||||
| -rw-r--r-- | drivers/firmware/efi/libstub/fdt.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c index 30ac0c975f8a..3d36142cf812 100644 --- a/drivers/firmware/efi/libstub/arm-stub.c +++ b/drivers/firmware/efi/libstub/arm-stub.c @@ -75,6 +75,9 @@ void install_memreserve_table(efi_system_table_t *sys_table_arg) efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID; efi_status_t status; + if (IS_ENABLED(CONFIG_ARM)) + return; + status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv), (void **)&rsv); if (status != EFI_SUCCESS) { diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 8830fa601e45..0c0d2312f4a8 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -158,6 +158,10 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, return efi_status; } } + + /* shrink the FDT back to its minimum size */ + fdt_pack(fdt); + return EFI_SUCCESS; fdt_set_fail: |