diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
| commit | cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49 (patch) | |
| tree | 6cbcf7e9d87bc571b80ec1f75b5cb21a8e34b937 /include/linux/efi.h | |
| parent | a555e9d86ee384d9d3cb3310a57aed33f7e053d4 (diff) | |
| parent | 541676078b52f365f53d46ee5517d305cd1b6350 (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index d813f7b04da7..29fdf8029cf6 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -140,11 +140,13 @@ struct efi_boot_memmap { struct capsule_info { efi_capsule_header_t header; + efi_capsule_header_t *capsule; int reset_type; long index; size_t count; size_t total_size; - phys_addr_t *pages; + struct page **pages; + phys_addr_t *phys; size_t page_bytes_remain; }; |