Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c473389c authored by Geoff Levand's avatar Geoff Levand Committed by Ian Maund
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Git-commit: b22cf637bbaf99d4caf9908997a32f91cdcfae52
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent afa0e52c

arch/arm64/kernel/head.S

+0 −10
Original line number Diff line number Diff line
@@ -485,8 +485,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
@@ -501,15 +499,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

arch/arm64/kernel/vmlinux.lds.S

+0 −2
Original line number Diff line number Diff line
@@ -117,11 +117,9 @@ SECTIONS 


	. = ALIGN(PAGE_SIZE);

	_data = .;

	__data_loc = _data - LOAD_OFFSET;

	_sdata = .;

	RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)

	_edata = .;

	_edata_loc = __data_loc + SIZEOF(.data);



	BSS_SECTION(0, 0, 0)

	_end = .;