diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/arm/kernel/relocate_kernel.S | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/arm/kernel/relocate_kernel.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S index d0cdedf4864d..95858966d84e 100644 --- a/arch/arm/kernel/relocate_kernel.S +++ b/arch/arm/kernel/relocate_kernel.S | |||
| @@ -2,10 +2,12 @@ | |||
| 2 | * relocate_kernel.S - put the kernel image in place to boot | 2 | * relocate_kernel.S - put the kernel image in place to boot |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/linkage.h> | ||
| 5 | #include <asm/kexec.h> | 6 | #include <asm/kexec.h> |
| 6 | 7 | ||
| 7 | .globl relocate_new_kernel | 8 | .align 3 /* not needed for this code, but keeps fncpy() happy */ |
| 8 | relocate_new_kernel: | 9 | |
| 10 | ENTRY(relocate_new_kernel) | ||
| 9 | 11 | ||
| 10 | ldr r0,kexec_indirection_page | 12 | ldr r0,kexec_indirection_page |
| 11 | ldr r1,kexec_start_address | 13 | ldr r1,kexec_start_address |
| @@ -79,6 +81,8 @@ kexec_mach_type: | |||
| 79 | kexec_boot_atags: | 81 | kexec_boot_atags: |
| 80 | .long 0x0 | 82 | .long 0x0 |
| 81 | 83 | ||
| 84 | ENDPROC(relocate_new_kernel) | ||
| 85 | |||
| 82 | relocate_new_kernel_end: | 86 | relocate_new_kernel_end: |
| 83 | 87 | ||
| 84 | .globl relocate_new_kernel_size | 88 | .globl relocate_new_kernel_size |