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

x86: beautify vmlinux_64.lds.S 



Beautify vmlinux_64.lds.S:

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

There is no functional changes in this patch

The beautification is done to prepare a unification
of the _32 and the _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: <20090426210742.GA3464@uranus.ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d1f0ae5e

arch/x86/kernel/vmlinux_64.lds.S

+243 −205
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ SECTIONS 
{

	. = __START_KERNEL;

	phys_startup_64 = startup_64 - LOAD_OFFSET;



	/* Text and read-only data */

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

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

		_text = .;

		/* First the code that has to be first for bootstrapping */

		*(.text.head)

		_stext = .;
@@ -42,12 +44,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)
@@ -56,28 +60,34 @@ SECTIONS 


	RODATA



  . = ALIGN(PAGE_SIZE);		/* Align data segment to page size boundary */

	/* Align data segment to page size boundary */

	. = ALIGN(PAGE_SIZE);

	/* Data */

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

		DATA_DATA

		CONSTRUCTORS

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

		/* End of data section */

		_edata = .;

	} :data





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

	.data.cacheline_aligned :

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

		. = ALIGN(PAGE_SIZE);

		. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

		*(.data.cacheline_aligned)

	}



	. = ALIGN(CONFIG_X86_INTERNODE_CACHE_BYTES);

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

		*(.data.read_mostly)

	}



#define VSYSCALL_ADDR (-10*1024*1024)

#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + SIZEOF(.data.read_mostly) + 4095) & ~(4095))

#define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + SIZEOF(.data.read_mostly) + 4095) & ~(4095))

#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))

#define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + \

                            SIZEOF(.data.read_mostly) + 4095) & ~(4095))



#define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR)

#define VLOAD(x) (ADDR(x) - VLOAD_OFFSET)
@@ -86,34 +96,50 @@ SECTIONS 
#define VVIRT(x) (ADDR(x) - VVIRT_OFFSET)



	. = VSYSCALL_ADDR;

  .vsyscall_0 :	 AT(VSYSCALL_PHYS_ADDR) { *(.vsyscall_0) } :user

	.vsyscall_0 : AT(VSYSCALL_PHYS_ADDR) {

		*(.vsyscall_0)

	} :user



	__vsyscall_0 = VSYSCALL_VIRT_ADDR;



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

  .vsyscall_fn : AT(VLOAD(.vsyscall_fn)) { *(.vsyscall_fn) }

	.vsyscall_fn : AT(VLOAD(.vsyscall_fn)) {

		*(.vsyscall_fn)

	}



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

  .vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data))

		{ *(.vsyscall_gtod_data) }

	.vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data)) {

		*(.vsyscall_gtod_data)

	}



	vsyscall_gtod_data = VVIRT(.vsyscall_gtod_data);

  .vsyscall_clock : AT(VLOAD(.vsyscall_clock))

		{ *(.vsyscall_clock) }

	.vsyscall_clock : AT(VLOAD(.vsyscall_clock)) {

		*(.vsyscall_clock)

	}

	vsyscall_clock = VVIRT(.vsyscall_clock);





  .vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1))

		{ *(.vsyscall_1) }

  .vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2))

		{ *(.vsyscall_2) }

	.vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) {

		*(.vsyscall_1)

	}

	.vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2)) {

		*(.vsyscall_2)

	}



  .vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) { *(.vgetcpu_mode) }

	.vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) {

		*(.vgetcpu_mode)

	}

	vgetcpu_mode = VVIRT(.vgetcpu_mode);



	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

  .jiffies : AT(VLOAD(.jiffies)) { *(.jiffies) }

	.jiffies : AT(VLOAD(.jiffies)) {

		*(.jiffies)

	}

	jiffies = VVIRT(.jiffies);



  .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3))

		{ *(.vsyscall_3) }

	.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {

		*(.vsyscall_3)

	}



	. = VSYSCALL_VIRT_ADDR + PAGE_SIZE;
@@ -125,8 +151,9 @@ SECTIONS 
#undef VVIRT_OFFSET

#undef VVIRT



	/* init_task */

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

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

		. = ALIGN(THREAD_SIZE);

		*(.data.init_task)

	} :data.init
@@ -146,13 +173,15 @@ SECTIONS 
		__smp_alt_end = .;

	}



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

	/* Init code and data */

	. = ALIGN(PAGE_SIZE);

	__init_begin = .;	/* paired with __init_end */

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

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}



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

		__initdata_begin = .;

		INIT_DATA
@@ -165,21 +194,25 @@ SECTIONS 
		*(.init.setup)

		__setup_end = .;

	}



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

		__initcall_start = .;

		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(8);
@@ -195,14 +228,19 @@ SECTIONS 
		*(.altinstructions)

		__alt_instructions_end = .;

	}



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

		*(.altinstr_replacement)

	}

  /* .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

	}
@@ -239,7 +277,8 @@ SECTIONS 
		*(.data.nosave)

		. = ALIGN(PAGE_SIZE);

		__nosave_end = .;

  } :data.init2 /* use another section data.init2, see PERCPU_VADDR() above */

	} :data.init2

	/* use another section data.init2, see PERCPU_VADDR() above */



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

		. = ALIGN(PAGE_SIZE);
@@ -267,7 +306,6 @@ SECTIONS 
	}



	STABS_DEBUG



	DWARF_DEBUG

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE