summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-09-14 07:07:28 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-09-14 07:07:28 -0300
commit8ee4a93637fd50121edbe2d50ae965da2fcfa949 (patch)
treee4fa00ce41d91206f26a4406364e7b9cef831495 /cpu-all.h
parentMerge commit '9453c5bc2634fdbdd05450034c21a58806d366a4' into upstream-merge (diff)
parentram: remove support for loading v1 (diff)
downloadqemu-kvm-8ee4a93637fd50121edbe2d50ae965da2fcfa949.tar.gz
qemu-kvm-8ee4a93637fd50121edbe2d50ae965da2fcfa949.tar.bz2
qemu-kvm-8ee4a93637fd50121edbe2d50ae965da2fcfa949.zip
Merge commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4' into upstream-merge
* commit '1a621c8dc9e4dcc9d385bdd2c24c5b5dbfd0ebe4': (51 commits) ram: remove support for loading v1 move mux focus field from CharDriverState to MuxDriver monitor: fix muxing qdev: add parser for chardev properties Allow -serial chardev:<name> convert udp chardev to QemuOpts. convert mux chardev to QemuOpts. convert vc chardev to QemuOpts. convert tty + parport chardevs to QemuOpts. convert windows console chardev to QemuOpts. convert braille chardev to QemuOpts. convert msmouse chardev to QemuOpts. convert stdio chardev to QemuOpts. convert pty chardev to QemuOpts. convert unix+tcp chardevs to QemuOpts. sockets: add inet_listen_opts sockets: add inet_connect_opts sockets: add unix_*_opts for windows. sockets: add unix_listen_opts sockets: add unix_connect_opts ... Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 135af3f5a..93000ffd2 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -1022,7 +1022,7 @@ static inline int64_t cpu_get_real_ticks (void)
static inline int64_t cpu_get_real_ticks(void)
{
-#if __mips_isa_rev >= 2
+#if defined(__mips_isa_rev) && __mips_isa_rev >= 2
uint32_t count;
static uint32_t cyc_per_count = 0;