Commit 801edfcb authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'rth/tags/pull-axp-20161123' into staging 



Fix alpha smp interrupt masking

# gpg: Signature made Wed 23 Nov 2016 12:42:45 PM GMT
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* rth/tags/pull-axp-20161123:
  target-alpha: Fix interrupt mask for cpu1

Message-id: 1479905195-7424-1-git-send-email-rth@twiddle.net
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 659fc8d3 424ad838

hw/alpha/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static void cchip_write(void *opaque, hwaddr addr, 
        break;

    case 0x0240: /* DIM1 */

        /* DIM: Device Interrupt Mask Register, CPU1.  */

        s->cchip.dim[0] = val;

        s->cchip.dim[1] = val;

        cpu_irq_change(s->cchip.cpu[1], val & s->cchip.drir);

        break;