vmlinux.lds.h: Replace RW_DATA_SECTION with RW_DATA

Rename RW_DATA_SECTION to RW_DATA. (Calling this a "section" is a lie,
since it's multiple sections and section flags cannot be applied to
the macro.)

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> # s390
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Will Deacon <will@kernel.org>
Cc: x86-ml <x86@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20191029211351.13243-14-keescook@chromium.org

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index af411817dd7d5b20bab9123a4bc13e108fae08c1..edc45f45523b4b61f65df60aed8c04cac55abb9b 100644 (file)
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -50,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)

diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 7d1d27066deba88cf95446d498186e9ffabf1dff..54139a6f469b9474035d6168b8e68143fa33e0e2 100644 (file)
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -101,7 +101,7 @@ SECTIONS
         * 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 = .;
 

diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index d2a9651c24ad3e4f47df9cf5bb320afdfe3e541f..21b8b271c80d2c469c99e6b909c175ab7e3b95db 100644 (file)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -112,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)
        }

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 068db6860867f0cefadb7b6aedd5af8d07b33322..319ccb10846a6cae43883988e4c8776bbbc223ba 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -141,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)

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index e7dafc29b1fa0951d8ebc89c1029da76884d3730..a4b3e6c0680cd1b9469af77a94ea0893467f2aec 100644 (file)
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -214,7 +214,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

diff --git a/arch/csky/kernel/vmlinux.lds.S b/arch/csky/kernel/vmlinux.lds.S
index 8598bd7a7bcd0e4a988acecc2cf6e5e1f866ac64..2ff37beaf2bf38af39db8c44f58554e832f9909e 100644 (file)
--- a/arch/csky/kernel/vmlinux.lds.S
+++ b/arch/csky/kernel/vmlinux.lds.S
@@ -50,7 +50,7 @@ SECTIONS
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
        _edata = .;
 
        EXCEPTION_TABLE(L1_CACHE_BYTES)

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index d3247d33b11518bc9669124d47a780c4e929f50a..2ac7bdcd2fe01eec6e5b5a1f7b6ece50c41159e0 100644 (file)
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -47,7 +47,7 @@ SECTIONS
 #endif
        _sdata = . ;
        __data_start = . ;
-       RW_DATA_SECTION(0, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(0, PAGE_SIZE, THREAD_SIZE)
 #if defined(CONFIG_ROMKERNEL)
 #undef ADDR
 #endif

diff --git a/arch/hexagon/kernel/vmlinux.lds.S b/arch/hexagon/kernel/vmlinux.lds.S
index 0145251fa317ed9422d9678f185e659a6f59bd4a..0ca2471ddb9fb2567c89f0dbaf8c5391b85609e8 100644 (file)
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@@ -49,7 +49,7 @@ SECTIONS
        INIT_DATA_SECTION(PAGE_SIZE)
 
        _sdata = .;
-               RW_DATA_SECTION(32,PAGE_SIZE,_THREAD_SIZE)
+               RW_DATA(32,PAGE_SIZE,_THREAD_SIZE)
                RO_DATA(PAGE_SIZE)
        _edata = .;
 

diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds
index de80f8b8ae7831fdc1ca3f7b60beb82d0e3c1fc9..7b975420c3d9daa68c7a6327b50b9cae4c900cea 100644 (file)
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@ -61,7 +61,7 @@ SECTIONS {
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
        _edata = .;
 
        EXCEPTION_TABLE(16)

diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 625a5785804faf8d706442150e6cdcac0ee117c3..6e7eb49ed985e10b4551e674ffd28e5d82aa13b3 100644 (file)
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   RODATA
 
-  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
+  RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
 
   BSS_SECTION(0, 0, 0)
 

diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 9868270b0984487c5a83100514cd88e8ddd743cd..1a0ad6b6dd8c3726087785d964c35d5c0af30bfa 100644 (file)
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -30,7 +30,7 @@ SECTIONS
 
   EXCEPTION_TABLE(16) :data
   _sdata = .;                  /* Start of rw data section */
-  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data
+  RW_DATA(16, PAGE_SIZE, THREAD_SIZE) :data
   /* End of data goes *here* so that freeing init code works properly. */
   _edata = .;
   NOTES

diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index 2299694748ea52896999c29a22d9e6282755b463..b8efb08204a170c42440b3dfebc82af2ae03d68b 100644 (file)
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -69,7 +69,7 @@ SECTIONS {
        }
 
        _sdata = . ;
-       RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(32, PAGE_SIZE, THREAD_SIZE)
        _edata = . ;
 
        /* Under the microblaze ABI, .sdata and .sbss must be contiguous */

diff --git a/arch/nds32/kernel/vmlinux.lds.S b/arch/nds32/kernel/vmlinux.lds.S
index 10ff570ba95b58ec824a2752d224f3362e8381b6..f679d33974366205b7d39d25de03311127bcac07 100644 (file)
--- a/arch/nds32/kernel/vmlinux.lds.S
+++ b/arch/nds32/kernel/vmlinux.lds.S
@@ -54,7 +54,7 @@ SECTIONS
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
        _edata  =  .;
 
        EXCEPTION_TABLE(16)

diff --git a/arch/nios2/kernel/vmlinux.lds.S b/arch/nios2/kernel/vmlinux.lds.S
index 318804a2c7a140f4625cc06e542ec89b189540af..c55a7cfa107592536375dd457305b52f330ad387 100644 (file)
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@@ -50,7 +50,7 @@ SECTIONS
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       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)

diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index f73e0d3ea09f6b092c385def488f452fba9aa6a2..60449fd7f16f3765bc0a6415c536f0ce177fdbfd 100644 (file)
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -74,7 +74,7 @@ SECTIONS
        /* Whatever comes after _e_kernel_ro had better be page-aligend, too */
 
        /* 32 here is cacheline size... recheck this */
-       RW_DATA_SECTION(32, PAGE_SIZE, PAGE_SIZE)
+       RW_DATA(32, PAGE_SIZE, PAGE_SIZE)
 
         _edata  =  .;
 

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index e1c563c7dca1bb9297fec0a888af17b8b7202fa9..12b3d7d5e9e457cc2dc5ac5ee9e997ac32acdf5f 100644 (file)
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -148,7 +148,7 @@ SECTIONS
        data_start = .;
 
        /* Data */
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE)
 
        /* PA-RISC locks requires 16-byte alignment */
        . = ALIGN(16);

diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 66dc17d24dd9afecbc9556ca8bbb94b9d18c49c7..12f42f96d46e08df32bf9dce4f6367461c8e0403 100644 (file)
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -57,7 +57,7 @@ SECTIONS
                *(.srodata*)
        }
 
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
        .sdata : {
                __global_pointer$ = . + 0x800;
                *(.sdata*)

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index b33c4823f8b5bc8026487bf59dd0e40278c88bb1..37695499717da84c981e663cce6b6fe33f8c9b0b 100644 (file)
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -67,7 +67,7 @@ SECTIONS
        . = ALIGN(PAGE_SIZE);
        __end_ro_after_init = .;
 
-       RW_DATA_SECTION(0x100, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(0x100, PAGE_SIZE, THREAD_SIZE)
        BOOT_DATA_PRESERVED
 
        _edata = .;             /* End of data section */

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index fef39054cc70ee9a05a62d7c57fbc1cc3830a170..c60b19958c350b7c38420b33ea1029abb664c70d 100644 (file)
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -51,7 +51,7 @@ SECTIONS
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
        _edata = .;
 
        DWARF_EH_FRAME

diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 8929fbc35a80f04062f6772929e88ea812152bcf..7ec79918b566b859cbb52c0cc03b2ab0ebb96c32 100644 (file)
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -67,7 +67,7 @@ SECTIONS
        .data1 : {
                *(.data1)
        }
-       RW_DATA_SECTION(SMP_CACHE_BYTES, 0, THREAD_SIZE)
+       RW_DATA(SMP_CACHE_BYTES, 0, THREAD_SIZE)
 
        /* End of data section */
        _edata = .;

diff --git a/arch/unicore32/kernel/vmlinux.lds.S b/arch/unicore32/kernel/vmlinux.lds.S
index 367c80313beccaba8df951b354e1fb5a6df539f6..6fb320b337efd9366250d3a6296b9b71b245a464 100644 (file)
--- a/arch/unicore32/kernel/vmlinux.lds.S
+++ b/arch/unicore32/kernel/vmlinux.lds.S
@@ -44,7 +44,7 @@ SECTIONS
 
        _sdata = .;
        RO_DATA(PAGE_SIZE)
-       RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+       RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
        _edata = .;
 
        EXCEPTION_TABLE(L1_CACHE_BYTES)

diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index b97e5798b9cfa368dff40bad1ced32cad5956d8c..bdbd7c4056c18b9f28cde3a9d31db346e5940d18 100644 (file)
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -134,7 +134,7 @@ SECTIONS
   /* Data section */
 
   _sdata = .;
-  RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
+  RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
   _edata = .;
 
   /* Initialization code and data: */

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 061e57c609f6f471868652c5e6f6a0bc8d4f8814..356078e50a5c8528aef8ed94f429a1fb3e385ca2 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -24,7 +24,7 @@
  *
  *      _sdata = .;
  *     RO_DATA(PAGE_SIZE)
- *     RW_DATA_SECTION(...)
+ *     RW_DATA(...)
  *     _edata = .;
  *
  *     EXCEPTION_TABLE(...)
@@ -975,7 +975,7 @@
  * matches the requirement of PAGE_ALIGNED_DATA.
  *
  * use 0 as page_align if page_aligned data is not used */
-#define RW_DATA_SECTION(cacheline, pagealigned, inittask)              \
+#define RW_DATA(cacheline, pagealigned, inittask)                      \
        . = ALIGN(PAGE_SIZE);                                           \
        .data : AT(ADDR(.data) - LOAD_OFFSET) {                         \
                INIT_TASK_DATA(inittask)                                \