Commit f01ec4fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/build' into x86/asm, to pick up completed topic branch 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 45c08383 66584ea6

arch/alpha/kernel/vmlinux.lds.S

+8 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#define EMITS_PT_NOTE

#define RO_EXCEPTION_TABLE_ALIGN	16



#include <asm-generic/vmlinux.lds.h>

#include <asm/thread_info.h>

#include <asm/cache.h>
@@ -8,7 +12,7 @@ 
OUTPUT_FORMAT("elf64-alpha")

OUTPUT_ARCH(alpha)

ENTRY(__start)

PHDRS { kernel PT_LOAD; note PT_NOTE; }

PHDRS { text PT_LOAD; note PT_NOTE; }

jiffies = jiffies_64;

SECTIONS

{
@@ -27,17 +31,11 @@ SECTIONS 
		LOCK_TEXT

		*(.fixup)

		*(.gnu.warning)

	} :kernel

	} :text

	swapper_pg_dir = SWAPPER_PGD;

	_etext = .;	/* End of text section */



	NOTES :kernel :note

	.dummy : {

		*(.dummy)

	} :kernel



	RODATA

	EXCEPTION_TABLE(16)

	RO_DATA(4096)



	/* Will be freed after init */

	__init_begin = ALIGN(PAGE_SIZE);
@@ -52,7 +50,7 @@ SECTIONS 


	_sdata = .;	/* Start of rw data section */

	_data = .;

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)



	.got : {

		*(.got)

arch/arc/kernel/vmlinux.lds.S

+2 −4
Original line number Diff line number Diff line
@@ -95,13 +95,13 @@ SECTIONS 
	_etext = .;



	_sdata = .;

	RO_DATA_SECTION(PAGE_SIZE)

	RO_DATA(PAGE_SIZE)



	/*

	 * 1. this is .data essentially

	 * 2. THREAD_SIZE for init.task, must be kernel-stk sz aligned

	 */

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)



	_edata = .;
@@ -118,8 +118,6 @@ SECTIONS 
	/DISCARD/ : {	*(.eh_frame) }

#endif



	NOTES



	. = ALIGN(PAGE_SIZE);

	_end = . ;

arch/arm/kernel/vmlinux-xip.lds.S

+1 −3
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ SECTIONS 
	ARM_UNWIND_SECTIONS

#endif



	NOTES



	_etext = .;			/* End of text and rodata section */



	ARM_VECTORS
@@ -114,7 +112,7 @@ SECTIONS 


	. = ALIGN(THREAD_SIZE);

	_sdata = .;

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

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

		*(.data..ro_after_init)

	}

arch/arm/kernel/vmlinux.lds.S

+1 −3
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ SECTIONS 
	ARM_UNWIND_SECTIONS

#endif



	NOTES



#ifdef CONFIG_STRICT_KERNEL_RWX

	. = ALIGN(1<<SECTION_SHIFT);

#else
@@ -143,7 +141,7 @@ SECTIONS 
	__init_end = .;



	_sdata = .;

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	_edata = .;



	BSS_SECTION(0, 0, 0)

arch/arm64/kernel/vmlinux.lds.S

+5 −5
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>

 */



#define RO_EXCEPTION_TABLE_ALIGN	8



#include <asm-generic/vmlinux.lds.h>

#include <asm/cache.h>

#include <asm/kernel-pgtable.h>
@@ -135,11 +137,9 @@ SECTIONS 
	. = ALIGN(SEGMENT_ALIGN);

	_etext = .;			/* End of text section */



	RO_DATA(PAGE_SIZE)		/* everything from this point to     */

	EXCEPTION_TABLE(8)		/* __init_begin will be marked RO NX */

	NOTES

	/* everything from this point to __init_begin will be marked RO NX */

	RO_DATA(PAGE_SIZE)



	. = ALIGN(PAGE_SIZE);

	idmap_pg_dir = .;

	. += IDMAP_DIR_SIZE;
@@ -215,7 +215,7 @@ SECTIONS 


	_data = .;

	_sdata = .;

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)

	RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)



	/*

	 * Data written with the MMU off but read with the MMU on requires