Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / kernel / vmlinux-xip.lds.S

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