diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 17:04:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 17:04:36 -0800 |
| commit | 4da8ac753f977c6384b242b20c23189d7d7bbb0e (patch) | |
| tree | de203f881332944405f7601a0ca7b5cb63daf5df /arch | |
| parent | f5145b90f3eddfad36c041b2aac400c202a1be9e (diff) | |
| parent | 4600adf60ef54d10c86ffa2b9a0217b1df421d29 (diff) | |
Merge "arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/module.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h index e12af6754634..06ff7fd9e81f 100644 --- a/arch/arm64/include/asm/module.h +++ b/arch/arm64/include/asm/module.h @@ -17,6 +17,7 @@ #define __ASM_MODULE_H #include <asm-generic/module.h> +#include <asm/memory.h> #define MODULE_ARCH_VERMAGIC "aarch64" @@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module *mod, const Elf64_Rela *rela, Elf64_Sym *sym); #ifdef CONFIG_RANDOMIZE_BASE +#ifdef CONFIG_MODVERSIONS +#define ARCH_RELOCATES_KCRCTAB +#define reloc_start (kimage_vaddr - KIMAGE_VADDR) +#endif extern u64 module_alloc_base; #else #define module_alloc_base ((u64)_etext - MODULES_VSIZE) |