diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
| commit | 20f96e606509ee5084690179afe1810b95617a92 (patch) | |
| tree | 895c5fd7fd8b3d6c7a4afda9c82dc02bbe5fcc7a /arch/arm/kernel/head-common.S | |
| parent | 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 (diff) | |
| parent | fc2933c133744305236793025b00c2f7d258b687 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/kernel/head-common.S')
| -rw-r--r-- | arch/arm/kernel/head-common.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index 4a3982812a40..89c80154b9ef 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -95,7 +95,7 @@ __mmap_switched: THUMB( ldmia r4!, {r0, r1, r2, r3} ) THUMB( mov sp, r3 ) sub r2, r2, r1 - bl memcpy @ copy .data to RAM + bl __memcpy @ copy .data to RAM #endif ARM( ldmia r4!, {r0, r1, sp} ) @@ -103,7 +103,7 @@ __mmap_switched: THUMB( mov sp, r3 ) sub r2, r1, r0 mov r1, #0 - bl memset @ clear .bss + bl __memset @ clear .bss ldmia r4, {r0, r1, r2, r3} str r9, [r0] @ Save processor ID @@ -111,6 +111,9 @@ __mmap_switched: str r8, [r2] @ Save atags pointer cmp r3, #0 strne r10, [r3] @ Save control register values +#ifdef CONFIG_KASAN + bl kasan_early_init +#endif mov lr, #0 b start_kernel ENDPROC(__mmap_switched) |