From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Aug 2018 20:18:22 +0000 (-0700)
Subject: Merge tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: v4.19-rc1~72
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5e26830990a9e8816b6854f77c550f1c847d89d8;p=linux.git

Merge tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze

Pull arch/microblaze updates from Michal Simek:

 - use generic noncoherent direct mapping

 - use LDFLAGS instead of LD

 - pci error path fix

 - remove incorrect comments

* tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze/PCI: Remove stale pcibios_align_resource() comment
  microblaze: delete wrong comment about machine_early_init
  microblaze: add endianness options to LDFLAGS instead of LD
  microblaze: remove consistent_sync and consistent_sync_page
  microblaze: use generic dma_noncoherent_ops
  microblaze: warn if of_iomap() failed
---

5e26830990a9e8816b6854f77c550f1c847d89d8
diff --cc arch/microblaze/Kconfig
index 6163a39ddeb6,848e31a86ba5..ace5c5bf1836
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -1,7 -1,8 +1,9 @@@
  config MICROBLAZE
  	def_bool y
 +	select ARCH_NO_SWAP
  	select ARCH_HAS_GCOV_PROFILE_ALL
+ 	select ARCH_HAS_SYNC_DMA_FOR_CPU
+ 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
  	select ARCH_MIGHT_HAVE_PC_PARPORT
  	select ARCH_NO_COHERENT_DMA_MMAP if !MMU
  	select ARCH_WANT_IPC_PARSE_VERSION