Commit 8018ba4e authored by Mark Rutland's avatar Mark Rutland
Browse files

arm64: move SEGMENT_ALIGN to <asm/memory.h> 



Currently we define SEGMENT_ALIGN directly in our vmlinux.lds.S.

This is unfortunate, as the EFI stub currently open-codes the same
number, and in future we'll want to fiddle with this.

This patch moves the definition to our <asm/memory.h>, where it can be
used by both vmlinux.lds.S and the EFI stub code.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
parent f60ad4ed

arch/arm64/include/asm/memory.h

+19 −0
Original line number Diff line number Diff line
@@ -112,6 +112,25 @@ 


#define IRQ_STACK_SIZE		THREAD_SIZE



/*

 * Alignment of kernel segments (e.g. .text, .data).

 */

#if defined(CONFIG_DEBUG_ALIGN_RODATA)

/*

 *  4 KB granule:   1 level 2 entry

 * 16 KB granule: 128 level 3 entries, with contiguous bit

 * 64 KB granule:  32 level 3 entries, with contiguous bit

 */

#define SEGMENT_ALIGN			SZ_2M

#else

/*

 *  4 KB granule:  16 level 3 entries, with contiguous bit

 * 16 KB granule:   4 level 3 entries, without contiguous bit

 * 64 KB granule:   1 level 3 entry

 */

#define SEGMENT_ALIGN			SZ_64K

#endif



/*

 * Memory types available.

 */

arch/arm64/kernel/vmlinux.lds.S

+0 −16
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ PECOFF_FILE_ALIGNMENT = 0x200; 
#define PECOFF_EDATA_PADDING

#endif



#if defined(CONFIG_DEBUG_ALIGN_RODATA)

/*

 *  4 KB granule:   1 level 2 entry

 * 16 KB granule: 128 level 3 entries, with contiguous bit

 * 64 KB granule:  32 level 3 entries, with contiguous bit

 */

#define SEGMENT_ALIGN			SZ_2M

#else

/*

 *  4 KB granule:  16 level 3 entries, with contiguous bit

 * 16 KB granule:   4 level 3 entries, without contiguous bit

 * 64 KB granule:   1 level 3 entry

 */

#define SEGMENT_ALIGN			SZ_64K

#endif



SECTIONS

{

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE