diff options
| -rw-r--r-- | arch/arc/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/c6x/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/csky/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/h8300/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/hexagon/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/vmlinux-nommu.lds | 2 | ||||
| -rw-r--r-- | arch/nds32/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/nios2/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/openrisc/kernel/vmlinux.lds.S | 4 | ||||
| -rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 4 | ||||
| -rw-r--r-- | arch/riscv/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | arch/unicore32/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 | 
14 files changed, 17 insertions, 20 deletions
| diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S index 1d6eef4b6976..7d1d27066deb 100644 --- a/arch/arc/kernel/vmlinux.lds.S +++ b/arch/arc/kernel/vmlinux.lds.S @@ -95,7 +95,7 @@ SECTIONS  	_etext = .;  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	/*  	 * 1. this is .data essentially diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S index d6e3802536b3..a3547f9d415b 100644 --- a/arch/c6x/kernel/vmlinux.lds.S +++ b/arch/c6x/kernel/vmlinux.lds.S @@ -82,7 +82,7 @@ SECTIONS  	EXCEPTION_TABLE(16) -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	.const :  	{  		*(.const .const.* .gnu.linkonce.r.*) diff --git a/arch/csky/kernel/vmlinux.lds.S b/arch/csky/kernel/vmlinux.lds.S index 75dd31412242..8598bd7a7bcd 100644 --- a/arch/csky/kernel/vmlinux.lds.S +++ b/arch/csky/kernel/vmlinux.lds.S @@ -49,7 +49,7 @@ SECTIONS  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)  	_edata = .; diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S index 88776e785245..d3247d33b115 100644 --- a/arch/h8300/kernel/vmlinux.lds.S +++ b/arch/h8300/kernel/vmlinux.lds.S @@ -38,7 +38,7 @@ SECTIONS  	_etext = . ;  	}  	EXCEPTION_TABLE(16) -	RO_DATA_SECTION(4) +	RO_DATA(4)  	ROMEND = .;  #if defined(CONFIG_ROMKERNEL)  	. = RAMTOP; diff --git a/arch/hexagon/kernel/vmlinux.lds.S b/arch/hexagon/kernel/vmlinux.lds.S index 6a6e8fc422ee..0145251fa317 100644 --- a/arch/hexagon/kernel/vmlinux.lds.S +++ b/arch/hexagon/kernel/vmlinux.lds.S @@ -50,7 +50,7 @@ SECTIONS  	_sdata = .;  		RW_DATA_SECTION(32,PAGE_SIZE,_THREAD_SIZE) -		RO_DATA_SECTION(PAGE_SIZE) +		RO_DATA(PAGE_SIZE)  	_edata = .;  	EXCEPTION_TABLE(16) diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds index cf6edda38971..de80f8b8ae78 100644 --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds @@ -60,7 +60,7 @@ SECTIONS {  #endif  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)  	_edata = .; diff --git a/arch/nds32/kernel/vmlinux.lds.S b/arch/nds32/kernel/vmlinux.lds.S index c4f1c5a604c3..10ff570ba95b 100644 --- a/arch/nds32/kernel/vmlinux.lds.S +++ b/arch/nds32/kernel/vmlinux.lds.S @@ -53,7 +53,7 @@ SECTIONS  	_etext = .;			/* End of text and rodata section */  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)  	_edata  =  .; diff --git a/arch/nios2/kernel/vmlinux.lds.S b/arch/nios2/kernel/vmlinux.lds.S index 20e4078b3477..318804a2c7a1 100644 --- a/arch/nios2/kernel/vmlinux.lds.S +++ b/arch/nios2/kernel/vmlinux.lds.S @@ -49,7 +49,7 @@ SECTIONS  	__init_end = .;  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)  	_edata = .; diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S index 142c51c994f5..f73e0d3ea09f 100644 --- a/arch/openrisc/kernel/vmlinux.lds.S +++ b/arch/openrisc/kernel/vmlinux.lds.S @@ -67,8 +67,8 @@ SECTIONS  	_sdata = .; -	/* Page alignment required for RO_DATA_SECTION */ -	RO_DATA_SECTION(PAGE_SIZE) +	/* Page alignment required for RO_DATA */ +	RO_DATA(PAGE_SIZE)  	_e_kernel_ro = .;  	/* Whatever comes after _e_kernel_ro had better be page-aligend, too */ diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 168d12b2ebb8..e1c563c7dca1 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -109,7 +109,7 @@ SECTIONS  	_sdata = .;  	/* Architecturally we need to keep __gp below 0x1000000 and thus -	 * in front of RO_DATA_SECTION() which stores lots of tracepoint +	 * in front of RO_DATA() which stores lots of tracepoint  	 * and ftrace symbols. */  #ifdef CONFIG_64BIT  	. = ALIGN(16); @@ -127,7 +127,7 @@ SECTIONS  	}  #endif -	RO_DATA_SECTION(8) +	RO_DATA(8)  	/* RO because of BUILDTIME_EXTABLE_SORT */  	EXCEPTION_TABLE(8) diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S index df5229c4034d..66dc17d24dd9 100644 --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kernel/vmlinux.lds.S @@ -52,7 +52,7 @@ SECTIONS  	/* Start of data section */  	_sdata = .; -	RO_DATA_SECTION(L1_CACHE_BYTES) +	RO_DATA(L1_CACHE_BYTES)  	.srodata : {  		*(.srodata*)  	} diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index beb4df053e20..b33c4823f8b5 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -52,7 +52,7 @@ SECTIONS  		_etext = .;		/* End of text section */  	} :text = 0x0700 -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	. = ALIGN(PAGE_SIZE);  	_sdata = .;		/* Start of data section */ diff --git a/arch/unicore32/kernel/vmlinux.lds.S b/arch/unicore32/kernel/vmlinux.lds.S index 78c4c56057b0..367c80313bec 100644 --- a/arch/unicore32/kernel/vmlinux.lds.S +++ b/arch/unicore32/kernel/vmlinux.lds.S @@ -43,7 +43,7 @@ SECTIONS  	_etext = .;  	_sdata = .; -	RO_DATA_SECTION(PAGE_SIZE) +	RO_DATA(PAGE_SIZE)  	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)  	_edata = .; diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index a0a989fbe411..061e57c609f6 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -23,7 +23,7 @@   *	_etext = .;   *   *      _sdata = .; - *	RO_DATA_SECTION(PAGE_SIZE) + *	RO_DATA(PAGE_SIZE)   *	RW_DATA_SECTION(...)   *	_edata = .;   * @@ -363,7 +363,7 @@  /*   * Read only Data   */ -#define RO_DATA_SECTION(align)						\ +#define RO_DATA(align)							\  	. = ALIGN((align));						\  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\  		__start_rodata = .;					\ @@ -518,9 +518,6 @@  	. = ALIGN((align));						\  	__end_rodata = .; -/* All archs are supposed to use RO_DATA() */ -#define RO_DATA(align)  RO_DATA_SECTION(align) -  /*   * .text section. Map to function alignment to avoid address changes   * during second ld run in second ld pass when generating System.map |