aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/hpmc.S
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2018-10-14 21:58:00 +0200
committerHelge Deller <deller@gmx.de>2018-10-17 08:18:01 +0200
commit99a3ae51d557d8e38a7aece65678a31f9db215ee (patch)
tree45858d34ed20e071d0e5e4e01b4b78563a9833a2 /arch/parisc/kernel/hpmc.S
parentparisc: Fix map_pages() to not overwrite existing pte entries (diff)
downloadlinux-dev-99a3ae51d557d8e38a7aece65678a31f9db215ee.tar.xz
linux-dev-99a3ae51d557d8e38a7aece65678a31f9db215ee.zip
parisc: Fix exported address of os_hpmc handler
In the C-code we need to put the physical address of the hpmc handler in the interrupt vector table (IVA) in order to get HPMCs working. Since on parisc64 function pointers are indirect (in fact they are function descriptors) we instead export the address as variable and not as function. This reverts a small part of commit f39cce654f9a ("parisc: Add cfi_startproc and cfi_endproc to assembly code"). Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> [4.9+]
Diffstat (limited to 'arch/parisc/kernel/hpmc.S')
-rw-r--r--arch/parisc/kernel/hpmc.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 781c3b9a3e46..fde654115564 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -85,7 +85,7 @@ END(hpmc_pim_data)
.import intr_save, code
.align 16
-ENTRY_CFI(os_hpmc)
+ENTRY(os_hpmc)
.os_hpmc:
/*
@@ -302,7 +302,6 @@ os_hpmc_6:
b .
nop
.align 16 /* make function length multiple of 16 bytes */
-ENDPROC_CFI(os_hpmc)
.os_hpmc_end: