Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...

[pandora-kernel.git] / arch / parisc / kernel / vmlinux.lds.S

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index d64a6bb..e1a5584 100644 (file)
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -69,6 +69,9 @@ SECTIONS
        /* End of text section */
        _etext = .;
 
+       /* Start of data section */
+       _sdata = .;
+
        RODATA
 
        /* writeable */
@@ -134,6 +137,7 @@ SECTIONS
        . = ALIGN(16384);
        __init_begin = .;
        INIT_TEXT_SECTION(16384)
+       . = ALIGN(PAGE_SIZE);
        INIT_DATA_SECTION(16)
        /* we have to discard exit text and such at runtime, not link time */
        .exit.text :
@@ -145,7 +149,7 @@ SECTIONS
                EXIT_DATA
        }
 
-       PERCPU(PAGE_SIZE)
+       PERCPU(L1_CACHE_BYTES, PAGE_SIZE)
        . = ALIGN(PAGE_SIZE);
        __init_end = .;
        /* freed after init ends here */