Merge branch 'linus' into x86/cleanups

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

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index c412c0adc4a92445f551626ac5a10a5454387526..2cbf13b3ef11d0a1ff62f7eb5cec9b1c96333371 100644 (file)
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -46,6 +46,8 @@
 #include <asm/assembly.h>
 #include <asm/pdc.h>
 
+#include <linux/linkage.h>
+
        /*
         * stack for os_hpmc, the HPMC handler.
         * buffer for IODC procedures (for the HPMC handler).
@@ -53,13 +55,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
 
@@ -69,17 +71,15 @@ hpmc_raddr:
 
 #define HPMC_PIM_DATA_SIZE 896 /* Enough to hold all architected 2.0 state */
 
-       .export hpmc_pim_data, data
        .align 8
-hpmc_pim_data:
+ENTRY(hpmc_pim_data)
        .block HPMC_PIM_DATA_SIZE
+END(hpmc_pim_data)
 
        .text
 
-       .export os_hpmc, code
        .import intr_save, code
-
-os_hpmc:
+ENTRY(os_hpmc)
 
        /*
         * registers modified:
@@ -294,11 +294,6 @@ os_hpmc_6:
 
        b .
        nop
-
-       /* this label used to compute os_hpmc checksum */
-
-       .export os_hpmc_end, code
-
-os_hpmc_end:
-
+ENDPROC(os_hpmc)
+ENTRY(os_hpmc_end)     /* this label used to compute os_hpmc checksum */
        nop