From 97a9d3b5c526725cf44f0be9ba7d736db37617d9 Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Sun, 21 Oct 2018 02:08:57 +0000 Subject: powerpc/dtrace: Use explicit bit numbers to mask out PSL_EE There seems to be a race in CI, such that dtrace_asm.S might be assembled before the genassym is completed. This causes a build failure when PSL_EE doesn't exist, and is read as 0. Get around this by explicitly specifying the bits in the mask instead. --- sys/cddl/dev/dtrace/powerpc/dtrace_asm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/cddl/dev') diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S b/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S index d4074ddd5844..7a4d8c3af893 100644 --- a/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S @@ -72,7 +72,7 @@ ASENTRY_NOPROF(dtrace_interrupt_disable) rldicl %r0,%r3,48,1 rotldi %r0,%r0,16 #else - rlwinm %r0,%r3,0,~PSL_EE /* Clear EE flag */ + rlwinm %r0,%r3,0,17,15 /* Clear EE flag */ #endif mtmsr %r0 blr -- cgit v1.2.3