Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / arch / parisc / kernel / hpmc.S

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index e158b6f..0fbd0a0 100644 (file)
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -41,12 +41,12 @@
  */
 
        .level          1.1
-       .data
 
 #include <asm/assembly.h>
 #include <asm/pdc.h>
 
 #include <linux/linkage.h>
+#include <linux/init.h>
 
        /*
         * stack for os_hpmc, the HPMC handler.
@@ -55,22 +55,26 @@
         * IODC requires 7K byte stack.  That leaves 1K byte for os_hpmc.
         */
 
+       __PAGE_ALIGNED_BSS
        .align 4096
 hpmc_stack:
        .block 16384
 
 #define HPMC_IODC_BUF_SIZE 0x8000
 
+       __PAGE_ALIGNED_BSS
        .align 4096
 hpmc_iodc_buf:
        .block HPMC_IODC_BUF_SIZE
 
+       .section .bss
        .align 8
 hpmc_raddr:
        .block 128
 
 #define HPMC_PIM_DATA_SIZE 896 /* Enough to hold all architected 2.0 state */
 
+       .section .bss
        .align 8
 ENTRY(hpmc_pim_data)
        .block HPMC_PIM_DATA_SIZE
@@ -79,7 +83,7 @@ END(hpmc_pim_data)
        .text
 
        .import intr_save, code
-ENTRY(os_hpmc)
+ENTRY_CFI(os_hpmc)
 .os_hpmc:
 
        /*
@@ -295,11 +299,11 @@ os_hpmc_6:
 
        b .
        nop
-ENDPROC(os_hpmc)
+ENDPROC_CFI(os_hpmc)
 .os_hpmc_end:
-       nop
-.data
-.align 4
+
+
+       __INITRODATA
        .export os_hpmc_size
 os_hpmc_size:
        .word .os_hpmc_end-.os_hpmc