diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 06:50:07 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 06:50:07 -0600 |
| commit | 3d7f5721409d10d33f03891addf67e0984cf319e (patch) | |
| tree | afcc78a2eca711fc264772413f375b278ff837cf /hw/pl031.c | |
| parent | a19255a369f0ef34dfbbc1ed2631e68fbbebb8ce (diff) | |
| parent | 13a16f1d91fc7a46b65b22a33f6ffea1b826a097 (diff) | |
Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
* pmaydell/arm-devs.for-upstream: (22 commits)
hw/pl031: Actually raise interrupt on timer expiry
MAINTAINERS: Add hw/highbank.c maintainer
Remove unnecessary includes of primecell.h
hw/primecell.h: Remove obsolete pl080_init() declaration
hw/arm_sysctl: Drop legacy init function
hw/vexpress.c: Add vexpress-a15 machine
arm_boot: Pass base address of GIC CPU interface, not whole GIC
hw/vexpress.c: Instantiate the motherboard CLCD
hw/vexpress.c: Factor out daughterboard-specific initialization
hw/vexpress.c: Move secondary CPU boot code to SRAM
hw/vexpress.c: Make motherboard peripheral memory map table-driven
hw/a15mpcore.c: Add Cortex-A15 private peripheral model
MAINTAINERS: Add maintainers for Exynos SOC.
Exynos4210: added display controller implementation
hw/exynos4210.c: Add LAN support for SMDKC210.
hw/lan9118: Add basic 16-bit mode support.
ARM: exynos4210: MCT support.
ARM: exynos4210: basic Power Management Unit implementation
ARM: exynos4210: PWM support.
ARM: exynos4210: UART support
...
Diffstat (limited to 'hw/pl031.c')
| -rw-r--r-- | hw/pl031.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pl031.c b/hw/pl031.c index 05b5b11e1a..69abc4f345 100644 --- a/hw/pl031.c +++ b/hw/pl031.c @@ -76,7 +76,7 @@ static void pl031_interrupt(void * opaque) { pl031_state *s = (pl031_state *)opaque; - s->im = 1; + s->is = 1; DPRINTF("Alarm raised\n"); pl031_update(s); } |