diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:41 +0100 |
| commit | a2de36d8ce58e815dcfea081414b42e0956d5637 (patch) | |
| tree | a05fdff8080ca8c460dbed399dad0a7ef567d939 /arch | |
| parent | 760bc83263877de1c49598ad6bdc6aecaf772d07 (diff) | |
| parent | 6ab809a3d5b6ddec6e0dd12096fd0ce6bab66006 (diff) | |
| download | barebox-a2de36d8ce58e815dcfea081414b42e0956d5637.tar.gz barebox-a2de36d8ce58e815dcfea081414b42e0956d5637.tar.xz | |
Merge branch 'for-next/efi'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/linkage.h | 6 | ||||
| -rw-r--r-- | arch/x86/mach-efi/reloc_x86_64.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h new file mode 100644 index 0000000000..a8d1bdb7de --- /dev/null +++ b/arch/x86/include/asm/linkage.h @@ -0,0 +1,6 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +/* referenced by <linux/linkage.h> */ + +#endif diff --git a/arch/x86/mach-efi/reloc_x86_64.c b/arch/x86/mach-efi/reloc_x86_64.c index 1db72f5dbc..e83bacb302 100644 --- a/arch/x86/mach-efi/reloc_x86_64.c +++ b/arch/x86/mach-efi/reloc_x86_64.c @@ -35,11 +35,14 @@ SUCH DAMAGE. */ +#include <linux/linkage.h> #include <common.h> #include <efi.h> #include <elf.h> +asmlinkage efi_status_t _relocate (long, Elf64_Dyn *, efi_handle_t, efi_system_table_t *); + efi_status_t _relocate (long ldbase, Elf64_Dyn *dyn, efi_handle_t image, efi_system_table_t *systab) { long relsz = 0, relent = 0; |