sparc64 had hardcoded pagesize to 8192 for alignment.
But optimal alignment is PAGE_SIZE so replace harcoded values
with the PAGE_SIZE constant.
Note: PAGE_SIZE differ with configuration so this is a change
in functionality - see page.h

Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/sparc64/kernel/vmlinux.lds.S |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/sparc64/kernel/vmlinux.lds.S 
b/arch/sparc64/kernel/vmlinux.lds.S
index 6f924fd..8559d07 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -1,5 +1,6 @@
 /* ld script to make UltraLinux kernel */
 
+#include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 
 OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", "elf64-sparc")
@@ -22,7 +23,7 @@ SECTIONS
        _etext = .;
        PROVIDE (etext = .);
 
-       RODATA
+       RO_DATA(PAGE_SIZE)
 
        .data : {
                DATA_DATA
@@ -54,7 +55,7 @@ SECTIONS
        }
        __stop___ex_table = .;
 
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __init_begin = .;
        .init.text : {
                _sinittext = .;
@@ -117,7 +118,7 @@ SECTIONS
        __sun4v_2insn_patch_end = .;
 
 #ifdef CONFIG_BLK_DEV_INITRD
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __initramfs_start = .;
        .init.ramfs : {
                *(.init.ramfs)
@@ -125,13 +126,13 @@ SECTIONS
        __initramfs_end = .;
 #endif
 
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __per_cpu_start = .;
        .data.percpu  : {
                *(.data.percpu)
        }
        __per_cpu_end = .;
-       . = ALIGN(8192);
+       . = ALIGN(PAGE_SIZE);
        __init_end = .;
 
        __bss_start = .;
-- 
1.5.1.rc3.20.gaa453

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to