diff options
| author | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
| commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
| tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /arch/x86/entry/entry_64.S | |
| parent | x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms (diff) | |
| parent | x86/mm: Fix vmalloc_fault to use pXd_large (diff) | |
| download | kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.gz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.xz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.zip | |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
Diffstat (limited to 'arch/x86/entry/entry_64.S')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 8a78030a82f2..74180b3d43bd 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -55,7 +55,7 @@ END(native_usergs_sysret64) .macro TRACE_IRQS_FLAGS flags:req #ifdef CONFIG_TRACE_IRQFLAGS - bt $9, \flags /* interrupts off? */ + btl $9, \flags /* interrupts off? */ jnc 1f TRACE_IRQS_ON 1: |