diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-04-24 13:58:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-24 13:58:21 -0700 |
| commit | e8fcb30c56cecf31701a886e03c87a64c774025f (patch) | |
| tree | d7d590b76746e44a282fe7319ef87c593bff9de0 /hw | |
| parent | c489f03ff6ff3481837bb9425f52babb0984378d (diff) | |
| parent | 62c93beade8ef5bcb0083f387d62f65259d42675 (diff) | |
| download | external_qemu-e8fcb30c56cecf31701a886e03c87a64c774025f.zip external_qemu-e8fcb30c56cecf31701a886e03c87a64c774025f.tar.gz external_qemu-e8fcb30c56cecf31701a886e03c87a64c774025f.tar.bz2 | |
am 62c93bea: Merge "[MIPS] Tweak MIPS support to work in Android qemu framework"
* commit '62c93beade8ef5bcb0083f387d62f65259d42675':
[MIPS] Tweak MIPS support to work in Android qemu framework
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mips_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_timer.c b/hw/mips_timer.c index bb3c3e4..6bae90b 100644 --- a/hw/mips_timer.c +++ b/hw/mips_timer.c @@ -103,7 +103,7 @@ static void mips_timer_cb (void *opaque) void cpu_mips_clock_init (CPUState *env) { - env->timer = qemu_new_timer(vm_clock, &mips_timer_cb, env); + env->timer = qemu_new_timer_ns(vm_clock, &mips_timer_cb, env); env->CP0_Compare = 0; cpu_mips_store_count(env, 1); } |