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.14.10~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=482b6942a8c1e5110a44787f6e72e0d0775bf4c0;p=users%2Fjedix%2Flinux-maple.git

parisc: Align os_hpmc_size on word boundary

commit 0ed9d3de5f8f97e6efd5ca0e3377cab5f0451ead upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index e3a8e5e4d5de..8d072c44f300 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -305,6 +305,7 @@ ENDPROC_CFI(os_hpmc)
 
 
 	__INITRODATA
+	.align 4
 	.export os_hpmc_size
 os_hpmc_size:
 	.word .os_hpmc_end-.os_hpmc