From: Simon Glass <sjg@chromium.org>
Date: Mon, 16 Jan 2017 14:04:05 +0000 (-0700)
Subject: x86: Drop flag_is_changable() on x86_64
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4b57414a628c9fb1a4ad2cf109943991569a72ce;p=u-boot.git

x86: Drop flag_is_changable() on x86_64

This doesn't build at present and is not used in a 64-bit build. Disable it
for now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 540024a859..b408515582 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -159,6 +159,8 @@ static inline unsigned int cpuid_edx(unsigned int op)
 	return edx;
 }
 
+#if !CONFIG_IS_ENABLED(X86_64)
+
 /* Standard macro to see if a specific flag is changeable */
 static inline int flag_is_changeable_p(uint32_t flag)
 {
@@ -179,6 +181,7 @@ static inline int flag_is_changeable_p(uint32_t flag)
 		: "ir" (flag));
 	return ((f1^f2) & flag) != 0;
 }
+#endif
 
 static inline void mfence(void)
 {