Author: jhibbits
Date: Sun Oct 21 02:08:57 2018
New Revision: 339516
URL: https://svnweb.freebsd.org/changeset/base/339516
Log:
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.
Modified:
head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
==============================================================================
--- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Sun Oct 21 00:48:38
2018 (r339515)
+++ head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Sun Oct 21 02:08:57
2018 (r339516)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
