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

Commit 704daf55 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/asm' into x86/urgent 



Merge reason: The linker script cleanups are ready for upstream.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b0c6fbe4 123f3e1d

arch/x86/boot/compressed/head_32.S

+2 −1
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ 
 */

	.text



#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/page_types.h>

#include <asm/boot.h>

#include <asm/asm-offsets.h>



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

	__HEAD

ENTRY(startup_32)

	cld

	/*

arch/x86/boot/compressed/head_64.S

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
	.code32

	.text



#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/pgtable_types.h>
@@ -33,7 +34,7 @@ 
#include <asm/processor-flags.h>

#include <asm/asm-offsets.h>



	.section ".text.head"

	__HEAD

	.code32

ENTRY(startup_32)

	cld

arch/x86/boot/compressed/vmlinux.lds.S

+4 −2
Original line number Diff line number Diff line 
#include <asm-generic/vmlinux.lds.h>



OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)



#undef i386
@@ -18,9 +20,9 @@ SECTIONS 
	 * address 0.

	 */

	. = 0;

	.text.head : {

	.head.text : {

		_head = . ;

		*(.text.head)

		HEAD_TEXT

		_ehead = . ;

	}

	.rodata.compressed : {

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: