From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 18 Aug 2017 17:32:50 +0000 (+0100)
Subject: Merge branch 'for-next/kernel-mode-neon' into for-next/core
X-Git-Tag: v4.14-rc1~151^2~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a7ba38d68017477bd441c62b11bb6a1fc9140ecd;p=linux-block.git

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()
---

a7ba38d68017477bd441c62b11bb6a1fc9140ecd
diff --cc arch/arm64/include/asm/efi.h
index 2b1e5def2e49,835822242a1a..0cad5a5894b9
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@@ -3,8 -3,8 +3,9 @@@
  
  #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>
  #include <asm/neon.h>
  #include <asm/ptrace.h>