summaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-12-12 21:25:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-21 09:25:58 +0100
commit4d01ed83361cd01012b35413aac2711f18932fed (patch)
treef917c34d9b190a799b64548e9e67b30b12876157 /arch/parisc
parent3d67d62931d9471b860ba7a732d5961da1320a7e (diff)
parisc: Align os_hpmc_size on word boundary
[ Upstream commit 0ed9d3de5f8f97e6efd5ca0e3377cab5f0451ead ] The os_hpmc_size variable sometimes wasn't aligned at word boundary and thus triggered the unaligned fault handler at startup. Fix it by aligning it properly. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v4.14+ Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/kernel/hpmc.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 0fbd0a0e1cda..38d461aec46d 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -304,6 +304,7 @@ ENDPROC_CFI(os_hpmc)
__INITRODATA
+ .align 4
.export os_hpmc_size
os_hpmc_size:
.word .os_hpmc_end-.os_hpmc