projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: realview: fix sparsemem build
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
relocate_kernel.S
diff --git
a/arch/arm/kernel/relocate_kernel.S
b/arch/arm/kernel/relocate_kernel.S
index d0cdedf4864dc52092355e105f3ba04bba5c5704..95858966d84ec0f10d392a3356cb0367fcee0b85 100644
(file)
--- a/
arch/arm/kernel/relocate_kernel.S
+++ b/
arch/arm/kernel/relocate_kernel.S
@@
-2,10
+2,12
@@
* relocate_kernel.S - put the kernel image in place to boot
*/
* relocate_kernel.S - put the kernel image in place to boot
*/
+#include <linux/linkage.h>
#include <asm/kexec.h>
#include <asm/kexec.h>
- .globl relocate_new_kernel
-relocate_new_kernel:
+ .align 3 /* not needed for this code, but keeps fncpy() happy */
+
+ENTRY(relocate_new_kernel)
ldr r0,kexec_indirection_page
ldr r1,kexec_start_address
ldr r0,kexec_indirection_page
ldr r1,kexec_start_address
@@
-79,6
+81,8
@@
kexec_mach_type:
kexec_boot_atags:
.long 0x0
kexec_boot_atags:
.long 0x0
+ENDPROC(relocate_new_kernel)
+
relocate_new_kernel_end:
.globl relocate_new_kernel_size
relocate_new_kernel_end:
.globl relocate_new_kernel_size