diff options
| author | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2018-12-17 18:48:25 +0100 |
| commit | 02117e42db7470e59910088b2b0ee42d581d2651 (patch) | |
| tree | 7734414b46fb72ffc708ac924f3b6b69de1f0d4c /arch/x86/include/asm/fpu/internal.h | |
| parent | x86/mm: Drop usage of __flush_tlb_all() in kernel_physical_mapping_init() (diff) | |
| parent | x86/mm/cpa: Fix cpa_flush_array() TLB invalidation (diff) | |
| download | kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.gz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.tar.xz kernel-qcow2-linux-02117e42db7470e59910088b2b0ee42d581d2651.zip | |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/fpu/internal.h')
| -rw-r--r-- | arch/x86/include/asm/fpu/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index 5f7290e6e954..69dcdf195b61 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -226,7 +226,7 @@ static inline void copy_fxregs_to_kernel(struct fpu *fpu) "3: movl $-2,%[err]\n\t" \ "jmp 2b\n\t" \ ".popsection\n\t" \ - _ASM_EXTABLE_UA(1b, 3b) \ + _ASM_EXTABLE(1b, 3b) \ : [err] "=r" (err) \ : "D" (st), "m" (*st), "a" (lmask), "d" (hmask) \ : "memory") |