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

Commit 4ae59b91 authored by Tim Abbott's avatar Tim Abbott Committed by H. Peter Anvin
Browse files

x86: convert to use __HEAD and HEAD_TEXT macros. 



This has the consequence of changing the section name use for head
code from ".text.head" to ".head.text".  It also eliminates the
".text.head" output section (instead placing head code at the start of
the .text output section), which should be harmless.

This patch only changes the sections in the actual kernel, not those
in the compressed boot loader.

Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 1dc818c1

arch/x86/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) 
 * any particular GDT layout, because we load our own as soon as we

 * can.

 */

.section .text.head,"ax",@progbits

__HEAD

ENTRY(startup_32)

	/* test KEEP_SEGMENTS flag to see if the bootloader is asking

		us to not reload segments */

arch/x86/kernel/head_64.S

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ L4_START_KERNEL = pgd_index(__START_KERNEL_map) 
L3_START_KERNEL = pud_index(__START_KERNEL_map)



	.text

	.section .text.head

	__HEAD

	.code64

	.globl startup_64

startup_64:

arch/x86/kernel/vmlinux.lds.S

+3 −9
Original line number Diff line number Diff line
@@ -65,17 +65,11 @@ SECTIONS 
#endif



	/* Text and read-only data */



	/* bootstrapping code */

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

		_text = .;

		*(.text.head)

	} :text = 0x9090



	/* The rest of the text */

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

		_text = .;

		/* bootstrapping code */

		HEAD_TEXT

#ifdef CONFIG_X86_32

		/* not really needed, already page aligned */

		. = ALIGN(PAGE_SIZE);

		*(.text.page_aligned)

#endif