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

x86, vmlinux.lds: unify parainstructions 



32 bit:

 - increase alignment from 4 to 8 for .parainstructions
 - increase alignment from 4 to 8 for .altinstructions

64 bit:

 - move ALIGN() outside output section for .altinstructions

None of the above should result in any functional change.

[ Impact: refactor and unify linker script ]

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-10-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e58bdaa8

arch/x86/kernel/vmlinux.lds.S

+18 −0
Original line number Diff line number Diff line
@@ -291,6 +291,24 @@ SECTIONS 


	SECURITY_INIT



	. = ALIGN(8);

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

		__parainstructions = .;

		*(.parainstructions)

		__parainstructions_end = .;

	}



	. = ALIGN(8);

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

		__alt_instructions = .;

		*(.altinstructions)

		__alt_instructions_end = .;

	}



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

		*(.altinstr_replacement)

	}





#ifdef CONFIG_X86_32

# include "vmlinux_32.lds.S"

arch/x86/kernel/vmlinux_32.lds.S

+0 −18
Original line number Diff line number Diff line 
	. = 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

arch/x86/kernel/vmlinux_64.lds.S

+0 −18
Original line number Diff line number Diff line 
	. = ALIGN(8);

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

		__parainstructions = .;

		*(.parainstructions)

		__parainstructions_end = .;

	}



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

		. = ALIGN(8);

		__alt_instructions = .;

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE