diff options
| author | Geoff Levand <geoff@infradead.org> | 2013-12-14 00:20:13 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-12-20 12:04:48 +0000 |
| commit | b22cf637bbaf99d4caf9908997a32f91cdcfae52 (patch) | |
| tree | 717a748ba0486a33a66e1c41d094344a7de078b4 /arch/arm64/kernel/head.S | |
| parent | 0a5be743e8c3c3230600fbc0cf923fb5dbefd579 (diff) | |
| download | talos-obmc-linux-b22cf637bbaf99d4caf9908997a32f91cdcfae52.tar.gz talos-obmc-linux-b22cf637bbaf99d4caf9908997a32f91cdcfae52.zip | |
arm64: Remove unused __data_loc variable
The __data_loc variable is an unused left over from the 32 bit arm implementation.
Remove that variable and adjust the __mmap_switched startup routine accordingly.
Signed-off-by: Geoff Levand <geoff@infradead.org> for Huawei, Linaro
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index c68cca5c3523..0b281fffda51 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -482,8 +482,6 @@ ENDPROC(__create_page_tables) .type __switch_data, %object __switch_data: .quad __mmap_switched - .quad __data_loc // x4 - .quad _data // x5 .quad __bss_start // x6 .quad _end // x7 .quad processor_id // x4 @@ -498,15 +496,7 @@ __switch_data: __mmap_switched: adr x3, __switch_data + 8 - ldp x4, x5, [x3], #16 ldp x6, x7, [x3], #16 - cmp x4, x5 // Copy data segment if needed -1: ccmp x5, x6, #4, ne - b.eq 2f - ldr x16, [x4], #8 - str x16, [x5], #8 - b 1b -2: 1: cmp x6, x7 b.hs 2f str xzr, [x6], #8 // Clear BSS |
