Commit 70cd33d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-next-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI updates from Ard Biesheuvel via Borislav Petkov:
 "A few cleanups left and right, some of which were part of a initrd
  measured boot series that needs some more work, and so only the
  cleanup patches have been included for this release"

* tag 'efi-next-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/arm64: Update debug prints to reflect other entropy sources
  efi: x86: clean up previous struct mm switching
  efi: x86: move mixed mode stack PA variable out of 'efi_scratch'
  efi/libstub: move TPM related prototypes into efistub.h
  efi/libstub: fix prototype of efi_tcg2_protocol::get_event_log()
  efi/libstub: whitespace cleanup
  efi: ia64: move IA64-only declarations to new asm/efi.h header
parents 3e89c7ea 1c761ee9

arch/ia64/include/asm/efi.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_EFI_H

#define _ASM_EFI_H



typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);



void *efi_get_pal_addr(void);

void efi_map_pal_code(void);

void efi_memmap_walk(efi_freemem_callback_t, void *);

void efi_memmap_walk_uc(efi_freemem_callback_t, void *);

void efi_gettimeofday(struct timespec64 *ts);



#endif

arch/ia64/kernel/efi.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/kexec.h>

#include <linux/mm.h>



#include <asm/efi.h>

#include <asm/io.h>

#include <asm/kregs.h>

#include <asm/meminit.h>

arch/ia64/kernel/machine_kexec.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/numa.h>

#include <linux/mmzone.h>



#include <asm/efi.h>

#include <asm/numa.h>

#include <asm/mmu_context.h>

#include <asm/setup.h>

arch/ia64/kernel/mca.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#include <linux/gfp.h>



#include <asm/delay.h>

#include <asm/efi.h>

#include <asm/meminit.h>

#include <asm/page.h>

#include <asm/ptrace.h>

arch/ia64/kernel/smpboot.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/cache.h>

#include <asm/current.h>

#include <asm/delay.h>

#include <asm/efi.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/mca.h>