diff options
| author | eadler <eadler@FreeBSD.org> | 2014-02-04 03:36:42 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2014-02-04 03:36:42 +0000 |
| commit | ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb (patch) | |
| tree | 7e76e370b9406b0383b17bd343084addb4ad6a25 /sys/mips/rmi | |
| parent | d374d7f398b846dc59d8a5ec3c7bfb318cf880af (diff) | |
| download | FreeBSD-src-ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb.zip FreeBSD-src-ec294fd7f5fc5de11ed889d6c2d701f918d1ecfb.tar.gz | |
MFC r258779,r258780,r258787,r258822:
Fix undefined behavior: (1 << 31) is not defined as 1 is an int and this
shifts into the sign bit. Instead use (1U << 31) which gets the
expected result.
Similar to the (1 << 31) case it is not defined to do (2 << 30).
This fix is not ideal as it assumes a 32 bit int, but does fix the issue
for most cases.
A similar change was made in OpenBSD.
Diffstat (limited to 'sys/mips/rmi')
| -rw-r--r-- | sys/mips/rmi/pic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/mips/rmi/pic.h b/sys/mips/rmi/pic.h index 7b90eb9..d7e3add 100644 --- a/sys/mips/rmi/pic.h +++ b/sys/mips/rmi/pic.h @@ -214,7 +214,7 @@ void pic_setup_intr(int picintr, int irq, uint32_t cpumask, int level) mtx_lock_spin(&xlr_pic_lock); xlr_write_reg(mmio, PIC_IRT_0(picintr), cpumask); - xlr_write_reg(mmio, PIC_IRT_1(picintr), ((1 << 31) | (level << 30) | + xlr_write_reg(mmio, PIC_IRT_1(picintr), ((1U << 31) | (level << 30) | (1 << 6) | irq)); mtx_unlock_spin(&xlr_pic_lock); } |
