diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-12-29 18:46:34 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-12-29 18:46:34 -0200 |
| commit | a6ec654a7a863afff41b491a02ffd696c862cb41 (patch) | |
| tree | 81aa66c89515b8be78d4b2e438d1cf17d99d8ecb /cpu-all.h | |
| parent | Reinstate cpuid vendor override when kvm is enabled (diff) | |
| parent | Don't load options roms intended to be loaded by the bios in qemu (diff) | |
| download | qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.tar.gz qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.tar.bz2 qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.zip | |
Merge branch 'stable-0.12-upstream' into stable-0.12
* stable-0.12-upstream: (7 commits)
Don't load options roms intended to be loaded by the bios in qemu
USB: Improve usbdevice error messages
cpu-all.h: fix cpu_get_real_ticks() #ifdef
alpha: fix compile
user_only: compile everything with -fpie
fdc/sparc32: don't hang on detection under OBP
scsi-disk: Inquiry with allocation length of CDB < 36 (v4)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'cpu-all.h')
| -rw-r--r-- | cpu-all.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1018,7 +1018,8 @@ static inline int64_t cpu_get_real_ticks (void) #endif } -#elif (defined(__mips_isa_rev) && __mips_isa_rev >= 2) || defined(__linux__) +#elif defined(__mips__) && \ + ((defined(__mips_isa_rev) && __mips_isa_rev >= 2) || defined(__linux__)) /* * binutils wants to use rdhwr only on mips32r2 * but as linux kernel emulate it, it's fine |