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/neon.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/neon.h')
| -rw-r--r-- | arch/arm64/include/asm/neon.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/neon.h b/arch/arm64/include/asm/neon.h index ad4cdc966c0f..f922eaf780f9 100644 --- a/arch/arm64/include/asm/neon.h +++ b/arch/arm64/include/asm/neon.h @@ -8,12 +8,22 @@ * published by the Free Software Foundation. */ +#ifndef __ASM_NEON_H +#define __ASM_NEON_H + #include <linux/types.h> #include <asm/fpsimd.h> #define cpu_has_neon() system_supports_fpsimd() -#define kernel_neon_begin() kernel_neon_begin_partial(32) - -void kernel_neon_begin_partial(u32 num_regs); +void kernel_neon_begin(void); void kernel_neon_end(void); + +/* + * Temporary macro to allow the crypto code to compile. Note that the + * semantics of kernel_neon_begin_partial() are now different from the + * original as it does not allow being called in an interrupt context. + */ +#define kernel_neon_begin_partial(num_regs) kernel_neon_begin() + +#endif /* ! __ASM_NEON_H */ |