From: Helge Deller <deller@gmx.de>
Date: Tue, 12 Dec 2017 20:25:41 +0000 (+0100)
Subject: parisc: Align os_hpmc_size on word boundary
X-Git-Tag: v4.9.138~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d01ed83361cd01012b35413aac2711f18932fed;p=platform%2Fkernel%2Flinux-amlogic.git

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>
---

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