Merge branch 'parisc-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / arch / microblaze / kernel / vmlinux.lds.S

diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
index e1f3e87..2c09fa3 100644 (file)
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -11,6 +11,8 @@
 OUTPUT_ARCH(microblaze)
 ENTRY(microblaze_start)
 
+#define RO_EXCEPTION_TABLE_ALIGN       16
+
 #include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
@@ -46,14 +48,12 @@ SECTIONS {
        __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) {
                _fdt_start = . ;                /* place for fdt blob */
                *(__fdt_blob) ;                 /* Any link-placed DTB */
-               . = _fdt_start + 0x8000;        /* Pad up to 32kbyte */
+               . = _fdt_start + 0x10000;       /* Pad up to 64kbyte */
                _fdt_end = . ;
        }
 
        . = ALIGN(16);
-       RODATA
-       EXCEPTION_TABLE(16)
-       NOTES
+       RO_DATA(4096)
 
        /*
         * sdata2 section can go anywhere, but must be word aligned
@@ -70,7 +70,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 */