Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux-2.6] / arch / parisc / kernel / hpmc.S

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 43b41df0b54106b0c38862ed52762fa4ddc405fd..068322eb8c9bf3f49ad51ea7a36c9f75aff17e8c 100644 (file)
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -47,6 +47,7 @@
 #include <asm/pdc.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
        /*
         * stack for os_hpmc, the HPMC handler.
@@ -55,13 +56,13 @@
         * IODC requires 7K byte stack.  That leaves 1K byte for os_hpmc.
         */
 
-       .align 4096
+       .align  PAGE_SIZE
 hpmc_stack:
        .block 16384
 
 #define HPMC_IODC_BUF_SIZE 0x8000
 
-       .align 4096
+       .align  PAGE_SIZE
 hpmc_iodc_buf:
        .block HPMC_IODC_BUF_SIZE
 
@@ -76,7 +77,7 @@ ENTRY(hpmc_pim_data)
        .block HPMC_PIM_DATA_SIZE
 END(hpmc_pim_data)
 
-       .text
+       __HEAD
 
        .import intr_save, code
 ENTRY(os_hpmc)