Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

Pull more arm64 updates from Catalin Marinas:

 - fix W+X page (mark RO) allocated by the arm64 kprobes code

 - Makefile fix for .i files in out of tree modules

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: kprobe: make page to RO mode when allocate it
  arm64: kdump: fix small typo
  arm64: makefile fix build of .i file in external module case

diff --cc arch/arm64/Makefile
index b4e994cd3a421d2b0ebe988b227b670039ba6bc5,3016ccb41468682ef0b232df5097beddca3c831c..6cb9fc7e9382d7f48f1b9d98f00be6b8d9df1f4a
--- 1/arch/arm64/Makefile
--- 2/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -133,7 -145,9 +133,8 @@@ vdso_install
  # We use MRPROPER_FILES and CLEAN_FILES now
  archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 -      $(Q)$(MAKE) $(clean)=$(boot)/dts
  
+ ifeq ($(KBUILD_EXTMOD),)
  # We need to generate vdso-offsets.h before compiling certain files in kernel/.
  # In order to do that, we should use the archprepare target, but we can't since
  # asm-offsets.h is included in some files used to generate vdso-offsets.h, and