diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
| commit | 6107ff12922e5508a44b376b40a3041810cb00d2 (patch) | |
| tree | 56098d53043a8fcdd01dbf0dca565ceab09f95b3 /target-i386/cpu.h | |
| parent | be92bbf73dfd7d8a4786dc5f6c71590f4fbc5a32 (diff) | |
| parent | 8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0 (diff) | |
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 06e40f3e49..f0c07cde3b 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -737,10 +737,10 @@ typedef struct CPUX86State { user */ struct DeviceState *apic_state; - uint64 mcg_cap; - uint64 mcg_status; - uint64 mcg_ctl; - uint64 mce_banks[MCE_BANKS_DEF*4]; + uint64_t mcg_cap; + uint64_t mcg_status; + uint64_t mcg_ctl; + uint64_t mce_banks[MCE_BANKS_DEF*4]; uint64_t tsc_aux; |