diff options
| author |   Catalin Marinas <catalin.marinas@arm.com> | 2017-08-18 18:32:50 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-08-18 18:32:50 +0100 |
| commit | a7ba38d68017477bd441c62b11bb6a1fc9140ecd (patch) | |
| tree | 1c81049f03496ff5b40520531af3959b07c89f20 /arch/arm64/include/asm/efi.h | |
| parent | Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-next/core (diff) | |
| parent | arm64: neon/efi: Make EFI fpsimd save/restore variables static (diff) | |
| download | linux-dev-a7ba38d68017477bd441c62b11bb6a1fc9140ecd.tar.xz linux-dev-a7ba38d68017477bd441c62b11bb6a1fc9140ecd.zip | |
Merge branch 'for-next/kernel-mode-neon' into for-next/core
* for-next/kernel-mode-neon:
arm64: neon/efi: Make EFI fpsimd save/restore variables static
arm64: neon: Forbid when irqs are disabled
arm64: neon: Export kernel_neon_busy to loadable modules
arm64: neon: Temporarily add a kernel_mode_begin_partial() definition
arm64: neon: Remove support for nested or hardirq kernel-mode NEON
arm64: neon: Allow EFI runtime services to use FPSIMD in irq context
arm64: fpsimd: Consistently use __this_cpu_ ops where appropriate
arm64: neon: Add missing header guard in <asm/neon.h>
arm64: neon: replace generic definition of may_use_simd()
Diffstat (limited to 'arch/arm64/include/asm/efi.h')
| -rw-r--r-- | arch/arm64/include/asm/efi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 2b1e5def2e49..0cad5a5894b9 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -3,6 +3,7 @@ #include <asm/boot.h> #include <asm/cpufeature.h> +#include <asm/fpsimd.h> #include <asm/io.h> #include <asm/memory.h> #include <asm/mmu_context.h> @@ -21,8 +22,8 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define arch_efi_call_virt_setup() \ ({ \ - kernel_neon_begin(); \ efi_virtmap_load(); \ + __efi_fpsimd_begin(); \ }) #define arch_efi_call_virt(p, f, args...) \ @@ -34,8 +35,8 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define arch_efi_call_virt_teardown() \ ({ \ + __efi_fpsimd_end(); \ efi_virtmap_unload(); \ - kernel_neon_end(); \ }) #define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT) |