diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/efi.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/efi.h')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 8406ed7f9926..7093e4a6a0bc 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
| @@ -90,7 +90,8 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, | |||
| 90 | #endif /* CONFIG_X86_32 */ | 90 | #endif /* CONFIG_X86_32 */ |
| 91 | 91 | ||
| 92 | extern int add_efi_memmap; | 92 | extern int add_efi_memmap; |
| 93 | extern void efi_reserve_early(void); | 93 | extern void efi_set_executable(efi_memory_desc_t *md, bool executable); |
| 94 | extern void efi_memblock_x86_reserve_range(void); | ||
| 94 | extern void efi_call_phys_prelog(void); | 95 | extern void efi_call_phys_prelog(void); |
| 95 | extern void efi_call_phys_epilog(void); | 96 | extern void efi_call_phys_epilog(void); |
| 96 | 97 | ||