diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-24 09:50:32 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-24 09:50:32 +0000 |
| commit | 801edfcbb58a8dd3b591840c6131e2452f980d8d (patch) | |
| tree | 9481c08e51f4ffd2a3ff8bf109fe1c6276d4a3c9 | |
| parent | 659fc8d3427bf54ff50b7fffb2ca2fc0690d5e92 (diff) | |
| parent | 424ad8388f89f4202a7836d003273f23ebe04b09 (diff) | |
| download | qemu-801edfcbb58a8dd3b591840c6131e2452f980d8d.zip qemu-801edfcbb58a8dd3b591840c6131e2452f980d8d.tar.gz qemu-801edfcbb58a8dd3b591840c6131e2452f980d8d.tar.bz2 | |
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: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/alpha/typhoon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 883db13..f50f5cf 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -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; |