aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/hpmc.S
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-06-08 22:11:00 +0200
committerHelge Deller <deller@gmx.de>2017-06-09 11:34:56 +0200
commitf02e6c61bc1f5004ae37a539a1436af12eda6172 (patch)
tree4dd0d0259613f27c2bfcc049b5cf380e4834a648 /arch/parisc/kernel/hpmc.S
parentparisc: Don't hardcode PSW values in gsc_*() functions (diff)
downloadlinux-dev-f02e6c61bc1f5004ae37a539a1436af12eda6172.tar.xz
linux-dev-f02e6c61bc1f5004ae37a539a1436af12eda6172.zip
parisc: Don't hardcode PSW values in hpmc code
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel/hpmc.S')
-rw-r--r--arch/parisc/kernel/hpmc.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 0fbd0a0e1cda..e3a8e5e4d5de 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -44,6 +44,7 @@
#include <asm/assembly.h>
#include <asm/pdc.h>
+#include <asm/psw.h>
#include <linux/linkage.h>
#include <linux/init.h>
@@ -135,7 +136,7 @@ ENTRY_CFI(os_hpmc)
* So turn on the Q bit and turn off the M bit.
*/
- ldo 8(%r0),%r4 /* PSW Q on, PSW M off */
+ ldi PSW_SM_Q,%r4 /* PSW Q on, PSW M off */
mtctl %r4,ipsw
mtctl %r0,pcsq
mtctl %r0,pcsq
@@ -257,7 +258,7 @@ os_hpmc_5:
tovirt_r1 %r30 /* make sp virtual */
- rsm 8,%r0 /* Clear Q bit */
+ rsm PSW_SM_Q,%r0 /* Clear Q bit */
ldi 1,%r8 /* Set trap code to "1" for HPMC */
load32 PA(intr_save),%r1
be 0(%sr7,%r1)