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

Commit 5d1c20bc authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout 



Parts of the virtual memory layout (mainly the modules area) are
described using open-coded immediate values.

Use the SZ_ definitions from linux/sizes.h instead to make the code
clearer.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e3e92a7b

arch/arm/include/asm/memory.h

+4 −4
Original line number Diff line number Diff line
@@ -36,23 +36,23 @@ 
 * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area

 */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)

#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(0x01000000))

#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))

#define TASK_UNMAPPED_BASE	(UL(CONFIG_PAGE_OFFSET) / 3)



/*

 * The maximum size of a 26-bit user space task.

 */

#define TASK_SIZE_26		UL(0x04000000)

#define TASK_SIZE_26		(UL(1) << 26)



/*

 * The module space lives between the addresses given by TASK_SIZE

 * and PAGE_OFFSET - it must be within 32MB of the kernel text.

 */

#ifndef CONFIG_THUMB2_KERNEL

#define MODULES_VADDR		(PAGE_OFFSET - 16*1024*1024)

#define MODULES_VADDR		(PAGE_OFFSET - SZ_16M)

#else

/* smaller range for Thumb-2 symbols relocation (2^24)*/

#define MODULES_VADDR		(PAGE_OFFSET - 8*1024*1024)

#define MODULES_VADDR		(PAGE_OFFSET - SZ_8M)

#endif



#if TASK_SIZE > MODULES_VADDR