diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-01 11:02:26 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-01 11:02:26 +0300 |
| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 (patch) | |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c /arch/mips/include/asm/bootinfo.h | |
| parent | e22af0be2cf654bb225f19750c6b9aab1627dc9e (diff) | |
| parent | 2d6be4abf514fc26c83d239c7f31da1f95e4a31d (diff) | |
| download | linux-0871d5a66da5c41151e0896a90298b163e42f2e0.tar.xz | |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
Conflicts:
arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/bootinfo.h')
| -rw-r--r-- | arch/mips/include/asm/bootinfo.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h index ee9f5f2d18fc..e26a093bb17a 100644 --- a/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h @@ -164,6 +164,19 @@ static inline void plat_swiotlb_setup(void) {} * Return: Pointer to the flattened device tree blob. */ extern void *plat_get_fdt(void); + +#ifdef CONFIG_RELOCATABLE + +/** + * plat_fdt_relocated() - Update platform's information about relocated dtb + * + * This function provides a platform-independent API to set platform's + * information about relocated DTB if it needs to be moved due to kernel + * relocation occurring at boot. + */ +void plat_fdt_relocated(void *new_location); + +#endif /* CONFIG_RELOCATABLE */ #endif /* CONFIG_USE_OF */ #endif /* _ASM_BOOTINFO_H */ |