Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix (54ca4123) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sparc64/kernel/vmlinux.lds.S

+6 −5

Original line number	Diff line number	Diff line
		/* ld script to make UltraLinux kernel */

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

		OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", "elf64-sparc")
		@@ -23,7 +24,7 @@ SECTIONS
		_etext = .;
		PROVIDE (etext = .);

		RODATA
		RO_DATA(PAGE_SIZE)

		.data :
		{
		@@ -44,7 +45,7 @@ SECTIONS
		__ex_table : { *(__ex_table) }
		__stop___ex_table = .;

		. = ALIGN(8192);
		. = ALIGN(PAGE_SIZE);
		__init_begin = .;
		.init.text : {
		_sinittext = .;
		@@ -83,17 +84,17 @@ SECTIONS
		__sun4v_2insn_patch_end = .;

		#ifdef CONFIG_BLK_DEV_INITRD
		. = ALIGN(8192);
		. = ALIGN(PAGE_SIZE);
		__initramfs_start = .;
		.init.ramfs : { *(.init.ramfs) }
		__initramfs_end = .;
		#endif

		. = ALIGN(8192);
		. = ALIGN(PAGE_SIZE);
		__per_cpu_start = .;
		.data.percpu : { *(.data.percpu) }
		__per_cpu_end = .;
		. = ALIGN(8192);
		. = ALIGN(PAGE_SIZE);
		__init_end = .;
		__bss_start = .;
		.sbss : { (.sbss) (.scommon) }

+7 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@
		*(.data) \
		*(.data.init.refok)

		#define RODATA \
		. = ALIGN(4096); \
		#define RO_DATA(align) \
		. = ALIGN((align)); \
		.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
		VMLINUX_SYMBOL(__start_rodata) = .; \
		(.rodata) (.rodata.*) \
		@@ -135,7 +135,11 @@
		VMLINUX_SYMBOL(__end_rodata) = .; \
		} \
		\
		. = ALIGN(4096);
		. = ALIGN((align));

		/* RODATA provided for backward compatibility.
		* All archs are supposed to use RO_DATA() */
		#define RODATA RO_DATA(4096)

		#define SECURITY_INIT \
		.security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \