aboutsummaryrefslogtreecommitdiffstats
path: root/target-i386
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-02-09 18:04:23 -0800
committerXavier Ducrohet <xav@android.com>2011-02-09 18:04:23 -0800
commitfc8ed80ba1362d2ce500003625e1c9c39f765661 (patch)
tree760b9c298c8fe37411e174f7bd214ff644cda0ec /target-i386
parent1ebd6d701f91c34f4562f522d5b2ce32be056d85 (diff)
downloadexternal_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.zip
external_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.tar.gz
external_qemu-fc8ed80ba1362d2ce500003625e1c9c39f765661.tar.bz2
Revert "Build arm and x86 binaries at the same time."
This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 88547cb..4e7eb58 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 */