diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-09 15:34:16 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-02-09 15:34:16 -0800 |
| commit | 1ebd6d701f91c34f4562f522d5b2ce32be056d85 (patch) | |
| tree | c79222448d637e3cf8d9fc5279d0293275812521 /target-i386 | |
| parent | d98942188f1b190b2e2a2a7a4cb11bc4f8a22739 (diff) | |
| parent | a39b10bd2574825a815d6ad854499dd127cfa9cb (diff) | |
| download | external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.zip external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.gz external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.bz2 | |
Merge "Build arm and x86 binaries at the same time."
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 4e7eb58..88547cb 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -181,7 +181,7 @@ #define HF2_VINTR_SHIFT 3 /* value of V_INTR_MASKING bit */ #define HF2_GIF_MASK (1 << HF2_GIF_SHIFT) -#define HF2_HIF_MASK (1 << HF2_HIF_SHIFT) +#define HF2_HIF_MASK (1 << HF2_HIF_SHIFT) #define HF2_NMI_MASK (1 << HF2_NMI_SHIFT) #define HF2_VINTR_MASK (1 << HF2_VINTR_SHIFT) @@ -409,7 +409,7 @@ #define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */ #define CPUID_VENDOR_AMD_1 0x68747541 /* "Auth" */ -#define CPUID_VENDOR_AMD_2 0x69746e65 /* "enti" */ +#define CPUID_VENDOR_AMD_2 0x69746e65 /* "enti" */ #define CPUID_VENDOR_AMD_3 0x444d4163 /* "cAMD" */ #define CPUID_MWAIT_IBE (1 << 1) /* Interrupts can exit capability */ |