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

Commit 88cac29f authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

ARM: vmlinux*.lds.S: some decruftification 



Remove stuff from vmlinux.lds.S that is relevant only to the XIP build,
and stuff from vmlinux-xip.lds.S related to self-modifying code that
makes no sense in the XIP case.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: default avatarChris Brandt <Chris.Brandt@renesas.com>
parent 9520b1a1

arch/arm/kernel/vmlinux-xip.lds.S

+0 −14
Original line number Diff line number Diff line
@@ -77,9 +77,7 @@ SECTIONS 
		*(.text.fixup)

		*(__ex_table)

#endif

#ifndef CONFIG_SMP_ON_UP

		*(.alt.smp.init)

#endif

		*(.discard)

		*(.discard.*)

	}
@@ -181,18 +179,6 @@ SECTIONS 
		*(.taglist.init)

		__tagtable_end = .;

	}

#ifdef CONFIG_SMP_ON_UP

	.init.smpalt : {

		__smpalt_begin = .;

		*(.alt.smp.init)

		__smpalt_end = .;

	}

#endif

	.init.pv_table : {

		__pv_table_begin = .;

		*(.pv_table)

		__pv_table_end = .;

	}

	.init.data : {

		INIT_SETUP(16)

		INIT_CALLS

arch/arm/kernel/vmlinux.lds.S

+1 −3
Original line number Diff line number Diff line
@@ -236,9 +236,8 @@ SECTIONS 
	. = ALIGN(THREAD_SIZE);

#endif

	__init_end = .;

	__data_loc = .;



	.data : AT(__data_loc) {

	.data : {

		_data = .;		/* address in memory */

		_sdata = .;
@@ -260,7 +259,6 @@ SECTIONS 


		_edata = .;

	}

	_edata_loc = __data_loc + SIZEOF(.data);



	BUG_TABLE