Merge branch 'we21-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[linux-2.6-omap-h63xx.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 253ae1328271090b4a7d94853673e93f38800d1c..69240b52f8e17931d939c96c6c2901978717b9b9 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -118,15 +118,15 @@
         __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {        \
                *(__ksymtab_strings)                                    \
        }                                                               \
-       __end_rodata = .;                                               \
-       . = ALIGN(4096);                                                \
                                                                        \
        /* Built-in module parameters. */                               \
        __param : AT(ADDR(__param) - LOAD_OFFSET) {                     \
                VMLINUX_SYMBOL(__start___param) = .;                    \
                *(__param)                                              \
                VMLINUX_SYMBOL(__stop___param) = .;                     \
-       }
+       }                                                               \
+       __end_rodata = .;                                               \
+       . = ALIGN(4096);
 
 #define SECURITY_INIT                                                  \
        .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \