The patch titled
markers: use EXTRA_RWDATA in architectures
has been added to the -mm tree. Its filename is
markers-linker-m68knommu.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: markers: use EXTRA_RWDATA in architectures
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Cc: <linux-arch@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/vmlinux.lds.S | 1 +
arch/arm/kernel/vmlinux.lds.S | 1 +
arch/arm26/kernel/vmlinux-arm26-xip.lds.in | 1 +
arch/arm26/kernel/vmlinux-arm26.lds.in | 1 +
arch/avr32/kernel/vmlinux.lds.c | 1 +
arch/cris/arch-v10/vmlinux.lds.S | 1 +
arch/cris/arch-v32/vmlinux.lds.S | 1 +
arch/frv/kernel/vmlinux.lds.S | 1 +
arch/h8300/kernel/vmlinux.lds.S | 4 +++-
arch/i386/kernel/vmlinux.lds.S | 1 +
arch/ia64/kernel/vmlinux.lds.S | 2 +-
arch/m32r/kernel/vmlinux.lds.S | 1 +
arch/m68k/kernel/vmlinux-std.lds | 1 +
arch/m68k/kernel/vmlinux-sun3.lds | 1 +
arch/m68knommu/kernel/vmlinux.lds.S | 1 +
arch/mips/kernel/vmlinux.lds.S | 2 ++
arch/parisc/kernel/vmlinux.lds.S | 1 +
arch/powerpc/kernel/vmlinux.lds.S | 2 ++
arch/ppc/kernel/vmlinux.lds.S | 1 +
arch/s390/kernel/vmlinux.lds.S | 1 +
arch/sh/kernel/vmlinux.lds.S | 1 +
arch/sh64/kernel/vmlinux.lds.S | 1 +
arch/sparc/kernel/vmlinux.lds.S | 1 +
arch/sparc64/kernel/vmlinux.lds.S | 1 +
arch/um/kernel/dyn.lds.S | 1 +
arch/um/kernel/uml.lds.S | 1 +
arch/v850/kernel/vmlinux.lds.S | 1 +
arch/x86_64/kernel/vmlinux.lds.S | 1 +
arch/xtensa/kernel/vmlinux.lds.S | 2 +-
29 files changed, 33 insertions(+), 3 deletions(-)
diff -puN arch/alpha/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/alpha/kernel/vmlinux.lds.S
--- a/arch/alpha/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/alpha/kernel/vmlinux.lds.S
@@ -90,6 +90,7 @@ SECTIONS
_data = .;
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/arm/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/arm/kernel/vmlinux.lds.S
@@ -155,6 +155,7 @@ SECTIONS
* and the usual data section
*/
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
_edata = .;
diff -puN arch/arm26/kernel/vmlinux-arm26-xip.lds.in~markers-linker-m68knommu arch/arm26/kernel/vmlinux-arm26-xip.lds.in
--- a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in~markers-linker-m68knommu
+++ a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in
@@ -112,6 +112,7 @@ SECTIONS
* and the usual data section
*/
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
*(.init.data)
diff -puN arch/arm26/kernel/vmlinux-arm26.lds.in~markers-linker-m68knommu arch/arm26/kernel/vmlinux-arm26.lds.in
--- a/arch/arm26/kernel/vmlinux-arm26.lds.in~markers-linker-m68knommu
+++ a/arch/arm26/kernel/vmlinux-arm26.lds.in
@@ -107,6 +107,7 @@ SECTIONS
* and the usual data section
*/
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
_edata = .;
diff -puN arch/avr32/kernel/vmlinux.lds.c~markers-linker-m68knommu arch/avr32/kernel/vmlinux.lds.c
--- a/arch/avr32/kernel/vmlinux.lds.c~markers-linker-m68knommu
+++ a/arch/avr32/kernel/vmlinux.lds.c
@@ -107,6 +107,7 @@ SECTIONS
/* And the rest... */
*(.data.rel*)
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
_edata = .;
diff -puN arch/cris/arch-v10/vmlinux.lds.S~markers-linker-m68knommu arch/cris/arch-v10/vmlinux.lds.S
--- a/arch/cris/arch-v10/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/cris/arch-v10/vmlinux.lds.S
@@ -45,6 +45,7 @@ SECTIONS
__Sdata = . ;
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
}
__edata = . ; /* End of data section */
_edata = . ;
diff -puN arch/cris/arch-v32/vmlinux.lds.S~markers-linker-m68knommu arch/cris/arch-v32/vmlinux.lds.S
--- a/arch/cris/arch-v32/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/cris/arch-v32/vmlinux.lds.S
@@ -50,6 +50,7 @@ SECTIONS
__Sdata = . ;
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
}
__edata = . ; /* End of data section. */
_edata = . ;
diff -puN arch/frv/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/frv/kernel/vmlinux.lds.S
--- a/arch/frv/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/frv/kernel/vmlinux.lds.S
@@ -137,6 +137,7 @@ SECTIONS
.data : { /* Data */
*(.data .data.*)
*(.exit.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/h8300/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/h8300/kernel/vmlinux.lds.S
--- a/arch/h8300/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/h8300/kernel/vmlinux.lds.S
@@ -105,7 +105,9 @@ SECTIONS
. = ALIGN(0x4) ;
*(.data)
. = ALIGN(0x4) ;
- *(.data.*)
+ *(.data.*)
+ . = ALIGN(0x4) ;
+ EXTRA_RWDATA
. = ALIGN(0x4) ;
___init_begin = .;
diff -puN arch/i386/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/i386/kernel/vmlinux.lds.S
--- a/arch/i386/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/i386/kernel/vmlinux.lds.S
@@ -78,6 +78,7 @@ SECTIONS
. = ALIGN(4096);
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
} :data
diff -puN arch/ia64/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/ia64/kernel/vmlinux.lds.S
--- a/arch/ia64/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/ia64/kernel/vmlinux.lds.S
@@ -214,7 +214,7 @@ SECTIONS
data : { } :data
.data : AT(ADDR(.data) - LOAD_OFFSET)
- { *(.data) *(.data1) *(.gnu.linkonce.d*) CONSTRUCTORS }
+ { *(.data) *(.data1) *(.gnu.linkonce.d*) EXTRA_RWDATA CONSTRUCTORS }
. = ALIGN(16); /* gp must be 16-byte aligned for exc. table */
.got : AT(ADDR(.got) - LOAD_OFFSET)
diff -puN arch/m32r/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/m32r/kernel/vmlinux.lds.S
--- a/arch/m32r/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/m32r/kernel/vmlinux.lds.S
@@ -51,6 +51,7 @@ SECTIONS
*(.spu)
*(.spi)
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/m68k/kernel/vmlinux-std.lds~markers-linker-m68knommu arch/m68k/kernel/vmlinux-std.lds
--- a/arch/m68k/kernel/vmlinux-std.lds~markers-linker-m68knommu
+++ a/arch/m68k/kernel/vmlinux-std.lds
@@ -29,6 +29,7 @@ SECTIONS
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/m68k/kernel/vmlinux-sun3.lds~markers-linker-m68knommu arch/m68k/kernel/vmlinux-sun3.lds
--- a/arch/m68k/kernel/vmlinux-sun3.lds~markers-linker-m68knommu
+++ a/arch/m68k/kernel/vmlinux-sun3.lds
@@ -24,6 +24,7 @@ SECTIONS
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
. = ALIGN(16); /* Exception table */
__start___ex_table = .;
diff -puN arch/m68knommu/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/m68knommu/kernel/vmlinux.lds.S
--- a/arch/m68knommu/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/m68knommu/kernel/vmlinux.lds.S
@@ -134,6 +134,7 @@ SECTIONS {
. = ALIGN(4);
_sdata = . ;
*(.data)
+ EXTRA_RWDATA
. = ALIGN(8192) ;
*(.data.init_task)
_edata = . ;
diff -puN arch/mips/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/mips/kernel/vmlinux.lds.S
--- a/arch/mips/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/mips/kernel/vmlinux.lds.S
@@ -64,6 +64,8 @@ SECTIONS
*(.data)
+ EXTRA_RWDATA
+
CONSTRUCTORS
}
_gp = . + 0x8000;
diff -puN arch/parisc/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/parisc/kernel/vmlinux.lds.S
--- a/arch/parisc/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/parisc/kernel/vmlinux.lds.S
@@ -92,6 +92,7 @@ SECTIONS
. = ALIGN(L1_CACHE_BYTES);
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/powerpc/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/powerpc/kernel/vmlinux.lds.S
--- a/arch/powerpc/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/powerpc/kernel/vmlinux.lds.S
@@ -170,11 +170,13 @@ SECTIONS
*(.data)
*(.sdata)
*(.got.plt) *(.got)
+ EXTRA_RWDATA
}
#else
.data : {
*(.data .data.rel* .toc1)
*(.branch_lt)
+ EXTRA_RWDATA
}
.opd : {
diff -puN arch/ppc/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/ppc/kernel/vmlinux.lds.S
--- a/arch/ppc/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/ppc/kernel/vmlinux.lds.S
@@ -73,6 +73,7 @@ SECTIONS
*(.sdata2)
*(.got.plt) *(.got)
*(.dynamic)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/s390/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/s390/kernel/vmlinux.lds.S
--- a/arch/s390/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/s390/kernel/vmlinux.lds.S
@@ -49,6 +49,7 @@ SECTIONS
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/sh/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/sh/kernel/vmlinux.lds.S
--- a/arch/sh/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/sh/kernel/vmlinux.lds.S
@@ -40,6 +40,7 @@ SECTIONS
.data : { /* Data */
*(.data)
+ EXTRA_RWDATA
/* Align the initial ramdisk image (INITRD) on page boundaries. */
. = ALIGN(PAGE_SIZE);
diff -puN arch/sh64/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/sh64/kernel/vmlinux.lds.S
--- a/arch/sh64/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/sh64/kernel/vmlinux.lds.S
@@ -79,6 +79,7 @@ SECTIONS
.data : C_PHYS(.data) { /* Data */
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
diff -puN arch/sparc/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/sparc/kernel/vmlinux.lds.S
--- a/arch/sparc/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/sparc/kernel/vmlinux.lds.S
@@ -23,6 +23,7 @@ SECTIONS
.data :
{
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
.data1 : { *(.data1) }
diff -puN arch/sparc64/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/sparc64/kernel/vmlinux.lds.S
--- a/arch/sparc64/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/sparc64/kernel/vmlinux.lds.S
@@ -28,6 +28,7 @@ SECTIONS
.data :
{
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
}
.data1 : { *(.data1) }
diff -puN arch/um/kernel/dyn.lds.S~markers-linker-m68knommu arch/um/kernel/dyn.lds.S
--- a/arch/um/kernel/dyn.lds.S~markers-linker-m68knommu
+++ a/arch/um/kernel/dyn.lds.S
@@ -98,6 +98,7 @@ SECTIONS
. = ALIGN(KERNEL_STACK_SIZE); /* init_task */
*(.data.init_task)
*(.data .data.* .gnu.linkonce.d.*)
+ EXTRA_RWDATA
SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
diff -puN arch/um/kernel/uml.lds.S~markers-linker-m68knommu arch/um/kernel/uml.lds.S
--- a/arch/um/kernel/uml.lds.S~markers-linker-m68knommu
+++ a/arch/um/kernel/uml.lds.S
@@ -61,6 +61,7 @@ SECTIONS
*(.data.init_task)
*(.data)
*(.gnu.linkonce.d*)
+ EXTRA_RWDATA
CONSTRUCTORS
}
.data1 : { *(.data1) }
diff -puN arch/v850/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/v850/kernel/vmlinux.lds.S
--- a/arch/v850/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/v850/kernel/vmlinux.lds.S
@@ -116,6 +116,7 @@
*(.data) \
*(.exit.data) /* 2.5 convention */ \
*(.data.exit) /* 2.4 convention */ \
+ EXTRA_RWDATA \
. = ALIGN (16) ; \
*(.data.cacheline_aligned) \
. = ALIGN (0x2000) ; \
diff -puN arch/x86_64/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/x86_64/kernel/vmlinux.lds.S
--- a/arch/x86_64/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/x86_64/kernel/vmlinux.lds.S
@@ -59,6 +59,7 @@ SECTIONS
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
*(.data)
+ EXTRA_RWDATA
CONSTRUCTORS
} :data
diff -puN arch/xtensa/kernel/vmlinux.lds.S~markers-linker-m68knommu arch/xtensa/kernel/vmlinux.lds.S
--- a/arch/xtensa/kernel/vmlinux.lds.S~markers-linker-m68knommu
+++ a/arch/xtensa/kernel/vmlinux.lds.S
@@ -144,7 +144,7 @@ SECTIONS
_fdata = .;
.data :
{
- *(.data) CONSTRUCTORS
+ *(.data) EXTRA_RWDATA CONSTRUCTORS
. = ALIGN(XCHAL_ICACHE_LINESIZE);
*(.data.cacheline_aligned)
}
_
Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are
avr32-remove-unneeded-cast-in-atomich.patch
git-powerpc.patch
ppc4xx_sgdma-needs-dma_mappingh.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-alpha.patch
atomich-complete-atomic_long-operations-in-asm-generic.patch
atomich-i386-type-safety-fix.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-ia64.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-mips.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-parisc.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc-fix.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-sparc64.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-x86_64.patch
atomich-atomic_add_unless-as-inline-remove-systemh-atomich-circular-dependency.patch
local_t-architecture-independant-extension.patch
local_t-alpha-extension.patch
local_t-i386-extension.patch
local_t-ia64-extension.patch
local_t-mips-extension.patch
local_t-parisc-cleanup.patch
local_t-powerpc-extension.patch
local_t-sparc64-cleanup.patch
local_t-x86_64-extension.patch
linux-kernel-markers-kconfig-menus.patch
linux-kernel-markers-architecture-independant-code.patch
linux-kernel-markers-powerpc-optimization.patch
linux-kernel-markers-i386-optimization.patch
linux-kernel-markers-i386-optimization-fix.patch
linux-kernel-markers-non-optimized-architectures.patch
linux-kernel-markers-documentation.patch
markers-define-the-linker-macro-extra_rwdata.patch
markers-linker-m68knommu.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
