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

Commit 9d93f005 authored by Geoffrey Thomas's avatar Geoffrey Thomas Committed by Linus Torvalds
Browse files

alpha: Clean up linker script using new linker script macros. 



Note that .data.page_aligned and .data.cacheline_aligned are now after
_data; it was probably a bug that they were before it.

Also, some explicit ALIGN(8)'s between various initcall sections were
removed; this should be harmless as the implicit alignment of
initcall_t was already 8.

Signed-off-by: default avatarGeoffrey Thomas <geofft@ksplice.com>
Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea12c2ed

arch/alpha/kernel/vmlinux.lds.S

+9 −81
Original line number Diff line number Diff line
@@ -32,84 +32,21 @@ SECTIONS 
	} :kernel



	RODATA



	/* Exception table */

	. = ALIGN(16);

	__ex_table : {

		__start___ex_table = .;

		*(__ex_table)

		__stop___ex_table = .;

	}

	EXCEPTION_TABLE(16)



	/* Will be freed after init */

	. = ALIGN(PAGE_SIZE);

	/* Init code and data */

	__init_begin = .;

	.init.text : {

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}

	.init.data : {

		INIT_DATA

	}



	. = ALIGN(16);

	.init.setup : {

		__setup_start = .;

		*(.init.setup)

		__setup_end = .;

	}



	. = ALIGN(8);

	.initcall.init : {

		__initcall_start = .;

		INITCALLS

		__initcall_end = .;

	}



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



	. = ALIGN(8);

	.con_initcall.init : {

		__con_initcall_start = .;

		*(.con_initcall.init)

		__con_initcall_end = .;

	}



	. = ALIGN(8);

	SECURITY_INIT



	__init_begin = ALIGN(PAGE_SIZE);

	INIT_TEXT_SECTION(PAGE_SIZE)

	INIT_DATA_SECTION(16)

	PERCPU(PAGE_SIZE)



	. = ALIGN(2 * PAGE_SIZE);

	/* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page

	   needed for the THREAD_SIZE aligned init_task gets freed after init */

	. = ALIGN(THREAD_SIZE);

	__init_end = .;

	/* Freed after init ends here */



	. = ALIGN(PAGE_SIZE);

	.data.page_aligned : {

		*(.data.page_aligned)

	}



	. = ALIGN(64);

	.data.cacheline_aligned : {

		*(.data.cacheline_aligned)

	}



	_data = .;

	/* Data */

	.data : {

		INIT_TASK_DATA(THREAD_SIZE)

		DATA_DATA

		CONSTRUCTORS

	}

	RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)



	.got : {

		*(.got)
@@ -119,16 +56,7 @@ SECTIONS 
	}

	_edata = .;	/* End of data section */



	__bss_start = .;

	.sbss : {

		*(.sbss)

		*(.scommon)

	}

	.bss : {

		*(.bss)

		*(COMMON)

	}

	__bss_stop = .;

	BSS_SECTION(0, 0, 0)

	_end = .;



	.mdebug 0 : {