x86: Port x86 over to compile cleanly with x86-64
Change-Id: I26f1bbf027435be593f11bce4780111dcaf7cb86
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Scott Duplichan <scott@notabs.org>
Reviewed-on: http://review.coreboot.org/10586
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/lib/cpu.c
index db72695..3eb7b94 100644
--- a/src/arch/x86/lib/cpu.c
+++ b/src/arch/x86/lib/cpu.c
@@ -10,6 +10,7 @@
#include <device/device.h>
#include <smp/spinlock.h>
+#ifndef __x86_64__
/* Standard macro to see if a specific flag is changeable */
static inline int flag_is_changeable_p(uint32_t flag)
{
@@ -78,6 +79,7 @@
: "=a" (ret) : : "cx", "dx" );
return ret;
}
+#endif
/* List of cpu vendor strings along with their normalized
* id values.
@@ -131,6 +133,7 @@
vendor_name[0] = '\0'; /* Unset */
+#ifndef __x86_64__
/* Find the id and vendor_name */
if (!cpu_have_cpuid()) {
/* Its a 486 if we can modify the AC flag */
@@ -148,6 +151,7 @@
memcpy(vendor_name, "NexGenDriven", 13);
}
}
+#endif
if (cpu_have_cpuid()) {
int cpuid_level;
struct cpuid_result result;