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

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

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index d6951bb5a9c97dd9f08483f9f2e5fab6e38a697f..2e516b871752d818a09622c0f14104aed429254c 100644 (file)
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -50,6 +50,7 @@ SECTIONS
 
        _text = .;              /* Text and read-only data */
        .text ALIGN(16) : {
+               HEAD_TEXT
                TEXT_TEXT
                SCHED_TEXT
                LOCK_TEXT
@@ -73,7 +74,7 @@ SECTIONS
         * that we can properly leave these
         * as writable
         */
-       . = ALIGN(ASM_PAGE_SIZE);
+       . = ALIGN(PAGE_SIZE);
        data_start = .;
        . = ALIGN(16);
        /* Exception table */
@@ -119,12 +120,12 @@ SECTIONS
        /* nosave data is really only used for software suspend...it's here
         * just in case we ever implement it
         */
-       . = ALIGN(ASM_PAGE_SIZE);
+       . = ALIGN(PAGE_SIZE);
        __nosave_begin = .;
        .data_nosave : {
                *(.data.nosave)
        }
-       . = ALIGN(ASM_PAGE_SIZE);
+       . = ALIGN(PAGE_SIZE);
        __nosave_end = .;
 
        /* End of data section */
@@ -133,7 +134,7 @@ SECTIONS
        /* BSS */
        __bss_start = .;
        /* page table entries need to be PAGE_SIZE aligned */
-       . = ALIGN(ASM_PAGE_SIZE);
+       . = ALIGN(PAGE_SIZE);
        .data.vmpages : {
                *(.data.vm0.pmd)
                *(.data.vm0.pgd)
@@ -153,14 +154,6 @@ SECTIONS
                *(.data.init_task)
        }
 
-       /* The interrupt stack is currently partially coded, but not yet
-        * implemented
-        */
-       . = ALIGN(16384);       
-       init_istack : {
-               *(init_istack)
-       }
-
 #ifdef CONFIG_64BIT
        . = ALIGN(16);
        /* Linkage tables */
@@ -180,11 +173,11 @@ SECTIONS
        __init_begin = .;
        .init.text : { 
                _sinittext = .;
-               *(.init.text)
+               INIT_TEXT
                _einittext = .;
        }
        .init.data : {
-               *(.init.data)
+               INIT_DATA
        }
        . = ALIGN(16);
        .init.setup : {
@@ -223,13 +216,13 @@ SECTIONS
         *  from .altinstructions and .eh_frame
         */
        .exit.text : {
-               *(.exit.text)
+               EXIT_TEXT
        }
        .exit.data : {
-               *(.exit.data)
+               EXIT_DATA
        }
 #ifdef CONFIG_BLK_DEV_INITRD
-       . = ALIGN(ASM_PAGE_SIZE);
+       . = ALIGN(PAGE_SIZE);
        .init.ramfs : {
                __initramfs_start = .;
                *(.init.ramfs)
@@ -237,8 +230,8 @@ SECTIONS
        }
 #endif
 
-       PERCPU(ASM_PAGE_SIZE)
-       . = ALIGN(ASM_PAGE_SIZE);
+       PERCPU(PAGE_SIZE)
+       . = ALIGN(PAGE_SIZE);
        __init_end = .;
        /* freed after init ends here */
        _end = . ;