From: Simon Glass <sjg@chromium.org>
Date: Mon, 16 Jan 2017 14:04:00 +0000 (-0700)
Subject: x86: Fix up CONFIG_X86_64 check
X-Git-Tag: v2017.03-rc2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34722da68a4edf3fcd4be164557a79f99e695506;p=platform%2Fkernel%2Fu-boot.git

x86: Fix up CONFIG_X86_64 check

When SPL and U-Boot proper have different settings for this flag, we need to
use the correct one. Fix this up in the interrupt code.

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

diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c
index 8dfbb48..a058303 100644
--- a/arch/x86/cpu/i386/interrupt.c
+++ b/arch/x86/cpu/i386/interrupt.c
@@ -234,7 +234,7 @@ int disable_interrupts(void)
 {
 	long flags;
 
-#ifdef CONFIG_X86_64
+#if CONFIG_IS_ENABLED(X86_64)
 	asm volatile ("pushfq ; popq %0 ; cli\n" : "=g" (flags) : );
 #else
 	asm volatile ("pushfl ; popl %0 ; cli\n" : "=g" (flags) : );