| commit | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 15:47:50 2022 +0200 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 17:19:45 2022 +0200 |
| tree | a6c9afae04d547459872e71460db6f8a454a070c | |
| parent | 0e64123141f3854e695eb4924d82b52856691466 [diff] [blame] |
Update Linux to v5.10.109 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.109.tar.xz Change-Id: I19bca9fc6762d4e63bcf3e4cba88bbe560d9c76c Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/arch/x86/include/asm/kaslr.h b/arch/x86/include/asm/kaslr.h index db7ba2f..0648190 100644 --- a/arch/x86/include/asm/kaslr.h +++ b/arch/x86/include/asm/kaslr.h
@@ -6,8 +6,10 @@ #ifdef CONFIG_RANDOMIZE_MEMORY void kernel_randomize_memory(void); +void init_trampoline_kaslr(void); #else static inline void kernel_randomize_memory(void) { } +static inline void init_trampoline_kaslr(void) {} #endif /* CONFIG_RANDOMIZE_MEMORY */ #endif