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

Commit 3bab79ed authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

Revert "arm64: account for sparsemem section alignment when choosing vmemmap offset" 



This reverts commit 36e5cd6b, since the
section alignment is now guaranteed by construction when choosing the
value of memstart_addr.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 06e9bf2f

arch/arm64/include/asm/pgtable.h

+2 −3
Original line number Diff line number Diff line
@@ -32,14 +32,13 @@ 
 * VMALLOC_END: extends to the available space below vmmemmap, PCI I/O space,

 *	fixed mappings and modules

 */

#define VMEMMAP_SIZE		ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * sizeof(struct page), PUD_SIZE)

#define VMEMMAP_SIZE		ALIGN((1UL << (VA_BITS - PAGE_SHIFT - 1)) * sizeof(struct page), PUD_SIZE)



#define VMALLOC_START		(MODULES_END)

#define VMALLOC_END		(PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - SZ_64K)



#define VMEMMAP_START		(VMALLOC_END + SZ_64K)

#define vmemmap			((struct page *)VMEMMAP_START - \

				 SECTION_ALIGN_DOWN(memstart_addr >> PAGE_SHIFT))

#define vmemmap			((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))



#define FIRST_USER_ADDRESS	0UL