diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:04:00 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | 34722da68a4edf3fcd4be164557a79f99e695506 (patch) | |
| tree | d339867d72f70d3590b65ad55658612ef5a3d73f /arch | |
| parent | a160092a610f4345cea5b606a8daf27d1feba185 (diff) | |
| download | u-boot-imx-34722da68a4edf3fcd4be164557a79f99e695506.zip u-boot-imx-34722da68a4edf3fcd4be164557a79f99e695506.tar.gz u-boot-imx-34722da68a4edf3fcd4be164557a79f99e695506.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/i386/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) : ); |