From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Nov 2018 17:55:23 +0000 (-0700)
Subject: Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=83650fd58a934fad5b7735fea96905ef986c0821;p=openwrt%2Fstaging%2Fblogic.git

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

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

83650fd58a934fad5b7735fea96905ef986c0821
diff --cc arch/arm64/Makefile
index b4e994cd3a42,3016ccb41468..6cb9fc7e9382
--- a/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