diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2018-10-21 02:08:57 +0000 |
|---|---|---|
| committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2018-10-21 02:08:57 +0000 |
| commit | 97a9d3b5c526725cf44f0be9ba7d736db37617d9 (patch) | |
| tree | 7a8f70b1663714c2f32f5ffd1d37971a6e9b3cbe /sys/cddl/dev | |
| parent | 8e1887fa1a188fabc579d509b97420ca8e0266a6 (diff) | |
| download | src-97a9d3b5c526725cf44f0be9ba7d736db37617d9.tar.gz src-97a9d3b5c526725cf44f0be9ba7d736db37617d9.zip | |
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.
Notes
Notes:
svn path=/head/; revision=339516
Diffstat (limited to 'sys/cddl/dev')
| -rw-r--r-- | sys/cddl/dev/dtrace/powerpc/dtrace_asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
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 |