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

Commit 123f3e1d authored by Tim Abbott's avatar Tim Abbott Committed by H. Peter Anvin
Browse files

x86: Cleanup linker script using new linker script macros. 



Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 07e81d61

arch/x86/kernel/vmlinux.lds.S

+3 −44
Original line number Diff line number Diff line
@@ -88,13 +88,7 @@ SECTIONS 


	NOTES :text :note



	/* Exception table */

	. = ALIGN(16);

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

		__start___ex_table = .;

		*(__ex_table)

		__stop___ex_table = .;

	} :text = 0x9090

	EXCEPTION_TABLE(16) :text = 0x9090



	RO_DATA(PAGE_SIZE)
@@ -207,36 +201,12 @@ SECTIONS 
	PERCPU_VADDR(0, :percpu)

#endif



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

		_sinittext = .;

		INIT_TEXT

		_einittext = .;

	}

	INIT_TEXT_SECTION(PAGE_SIZE)

#ifdef CONFIG_X86_64

	:init

#endif



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

		INIT_DATA

	}



	. = ALIGN(16);

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

		__setup_start = .;

		*(.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 = .;

	}

	INIT_DATA_SECTION(16)



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

		__x86_cpu_dev_start = .;
@@ -244,8 +214,6 @@ SECTIONS 
		__x86_cpu_dev_end = .;

	}



	SECURITY_INIT



	. = ALIGN(8);

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

		__parainstructions = .;
@@ -276,15 +244,6 @@ SECTIONS 
		EXIT_DATA

	}



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

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

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)

	PERCPU(PAGE_SIZE)

#endif