Commit aee6a166 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

x86: beautify vmlinux_32.lds.S 



Beautify vmlinux_32.lds.S:

 - Use tabs for indent
 - Located curly braces like in C code
 - Rearranged a few comments

To see actual differences use "git diff -b" which
ignore 'whitespace' changes.

The beautification is done to prepare a unification
of the _32 and _64 variants of the linker scripts.

[ Impact: cleanup ]

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-1-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 51b26ada

arch/x86/kernel/vmlinux_32.lds.S

+200 −176
Original line number Diff line number Diff line
@@ -31,14 +31,16 @@ SECTIONS 
	. = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;

	phys_startup_32 = startup_32 - LOAD_OFFSET;



	/* Text and read-only data */

	.text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {

  	_text = .;			/* Text and read-only data */

		_text = .;

		*(.text.head)

	} :text = 0x9090



	/* read-only */

	.text : AT(ADDR(.text) - LOAD_OFFSET) {

	. = ALIGN(PAGE_SIZE); /* not really needed, already page aligned */

		/* not really needed, already page aligned */

		. = ALIGN(PAGE_SIZE);

		*(.text.page_aligned)

		TEXT_TEXT

		SCHED_TEXT
@@ -47,12 +49,14 @@ SECTIONS 
		IRQENTRY_TEXT

		*(.fixup)

		*(.gnu.warning)

  	_etext = .;			/* End of text section */

		/* End of text section */

		_etext = .;

	} :text = 0x9090



	NOTES :text :note



  . = ALIGN(16);		/* Exception table */

	/* Exception table */

	. = ALIGN(16);

	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {

		__start___ex_table = .;

		 *(__ex_table)
@@ -63,7 +67,8 @@ SECTIONS 


	/* writeable */

	. = ALIGN(PAGE_SIZE);

  .data : AT(ADDR(.data) - LOAD_OFFSET) {	/* Data */

	/* Data */

	.data : AT(ADDR(.data) - LOAD_OFFSET) {

		DATA_DATA

		CONSTRUCTORS

	} :data
@@ -83,7 +88,8 @@ SECTIONS 
	}



	. = ALIGN(32);

  .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {

	.data.cacheline_aligned :

		AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {

		*(.data.cacheline_aligned)

	}
@@ -91,17 +97,20 @@ SECTIONS 
	. = ALIGN(32);

	.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {

		*(.data.read_mostly)

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



		/* End of data section */

		_edata = .;

	}



  . = ALIGN(THREAD_SIZE);	/* init_task */

	/* init_task */

	. = ALIGN(THREAD_SIZE);

	.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {

		*(.data.init_task)

	}



  /* might get freed after init */

	. = ALIGN(PAGE_SIZE);

	.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {

		/* might get freed after init */

		__smp_locks = .;

		*(.smp_locks)

		__smp_locks_end = .;
@@ -114,17 +123,19 @@ SECTIONS 
	 */

	. = ALIGN(PAGE_SIZE);



  /* will be freed after init */

  . = ALIGN(PAGE_SIZE);		/* Init code and data */

	/* Init code and data - will be freed after init */

	. = ALIGN(PAGE_SIZE);

	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {

		__init_begin = .;

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}



	.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {

		INIT_DATA

	}



	. = ALIGN(16);

	.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {

		__setup_start = .;
@@ -136,40 +147,51 @@ SECTIONS 
		INITCALLS

		__initcall_end = .;

	}



	.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {

		__con_initcall_start = .;

		*(.con_initcall.init)

		__con_initcall_end = .;

	}



	.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {

		__x86_cpu_dev_start = .;

		*(.x86_cpu_dev.init)

		__x86_cpu_dev_end = .;

	}



	SECURITY_INIT



	. = ALIGN(4);

	.altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {

		__alt_instructions = .;

		*(.altinstructions)

		__alt_instructions_end = .;

	}



	.altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {

		*(.altinstr_replacement)

	}



	. = ALIGN(4);

	.parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {

		__parainstructions = .;

		*(.parainstructions)

		__parainstructions_end = .;

	}

  /* .exit.text is discard at runtime, not link time, to deal with references

     from .altinstructions and .eh_frame */



	/*

	 * .exit.text is discard at runtime, not link time, to deal with

	 *  references from .altinstructions and .eh_frame

	 */

	.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {

		EXIT_TEXT

	}



	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {

		EXIT_DATA

	}



#if defined(CONFIG_BLK_DEV_INITRD)

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
@@ -178,13 +200,16 @@ SECTIONS 
		__initramfs_end = .;

	}

#endif



	PERCPU(PAGE_SIZE)



	. = ALIGN(PAGE_SIZE);

	/* freed after init ends here */



	/* BSS */

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {

		__init_end = .;

	__bss_start = .;		/* BSS */

		__bss_start = .;

		*(.bss.page_aligned)

		*(.bss)

		. = ALIGN(4);
@@ -210,7 +235,6 @@ SECTIONS 
	}



	STABS_DEBUG



	DWARF_DEBUG

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE