Эх сурвалжийг харах

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

Pull two arm64 fixes from Will Deacon:
 "Arm64 fixes seem to come in pairs recently.  We've got a fix for
  removing device-tree blobs when doing a make clean and another one
  addressing a missing include, which fixes build failures in -next for
  allmodconfig (spotted by Mark's buildbot).

  Summary from signed tag:

   - fix cleaning of .dtbs following directory restructuring
   - fix allmodconfig build breakage in -next due to missing include"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE
  arm64: Add dtb files to archclean rule
Linus Torvalds 10 жил өмнө
parent
commit
222713bb1e

+ 1 - 0
arch/arm64/Makefile

@@ -85,6 +85,7 @@ vdso_install:
 # We use MRPROPER_FILES and CLEAN_FILES now
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
 	$(Q)$(MAKE) $(clean)=$(boot)
+	$(Q)$(MAKE) $(clean)=$(boot)/dts
 
 
 define archhelp
 define archhelp
   echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
   echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'

+ 0 - 2
arch/arm64/boot/dts/Makefile

@@ -3,6 +3,4 @@ dts-dirs += apm
 dts-dirs += arm
 dts-dirs += arm
 dts-dirs += cavium
 dts-dirs += cavium
 
 
-always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)
 subdir-y	:= $(dts-dirs)
-clean-files	:= *.dtb

+ 1 - 0
arch/arm64/mm/dump.c

@@ -15,6 +15,7 @@
  */
  */
 #include <linux/debugfs.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/fs.h>
+#include <linux/io.h>
 #include <linux/mm.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/seq_file.h>