diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-03 10:57:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-03 10:57:30 +0300 |
| commit | 4b1fe9b58e9d20f23f6b07d1c2e0dbd921da67bf (patch) | |
| tree | f34ba0280adca87fdd0a81c923ee210b3d09a72a /arch/arm64/kernel/image.h | |
| parent | 6fbc7275c7a9ba97877050335f290341a1fd8dbf (diff) | |
| parent | aa69fb62bea15126e744af2e02acc0d6cf3ed4da (diff) | |
| download | linux-4b1fe9b58e9d20f23f6b07d1c2e0dbd921da67bf.tar.xz | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
"Fix a build failure with the LLVM linker and a module allocation
failure when KASLR is active:
- Fix module allocation when running with KASLR enabled
- Fix broken build due to bug in LLVM linker (ld.lld)"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly
arm64: kaslr: keep modules inside module region when KASAN is enabled
Diffstat (limited to 'arch/arm64/kernel/image.h')
| -rw-r--r-- | arch/arm64/kernel/image.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index 04ca08086d35..2b85c0d6fa3d 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -67,7 +67,11 @@ #ifdef CONFIG_EFI -__efistub_stext_offset = stext - _text; +/* + * Use ABSOLUTE() to avoid ld.lld treating this as a relative symbol: + * https://github.com/ClangBuiltLinux/linux/issues/561 + */ +__efistub_stext_offset = ABSOLUTE(stext - _text); /* * The EFI stub has its own symbol namespace prefixed by __efistub_, to |