x86: Allow interrupts to be disabled in 64-bit mode

Update the code to support both 32-bit and 64-bit modes.

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

diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index dd2819a12c79c2334f2191b498b19812308e9237..46babe00fac017274b297ac3a02b2091465ed85c 100644 (file)
--- a/arch/x86/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
@@ -238,8 +238,11 @@ int disable_interrupts(void)
 {
        long flags;
 
+#ifdef CONFIG_X86_64
+       asm volatile ("pushfq ; popq %0 ; cli\n" : "=g" (flags) : );
+#else
        asm volatile ("pushfl ; popl %0 ; cli\n" : "=g" (flags) : );
-
+#endif
        return flags & X86_EFLAGS_IF;
 }