From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2020 20:04:39 +0000 (-0800)
Subject: Merge tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=66fc6a6254c7a138aef7806bd933c218e1aefcfc;p=linux.git

Merge tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze updates from Michal Simek:
 "The biggest change is to remove support for noMMU configuration.

  FPGAs are bigger so people use Microblaze with MMU for a lot of years
  and there is likely no user of this code anymore. No one is updating
  libraries for this configuration either.

   - Remove noMMU support

   - Add support for TIF_NOTIFY_SIGNAL

   - Small header fix"

* tag 'microblaze-v5.11' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Remove noMMU code
  microblaze: add support for TIF_NOTIFY_SIGNAL
  microblaze: Replace <linux/clk-provider.h> by <linux/of_clk.h>
---

66fc6a6254c7a138aef7806bd933c218e1aefcfc
diff --cc arch/microblaze/Kconfig
index 93d459f016fc9,32739ab2af25a..f82795592ce5b
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -15,8 -13,9 +13,8 @@@ config MICROBLAZ
  	select TIMER_OF
  	select CLONE_BACKWARDS3
  	select COMMON_CLK
- 	select DMA_DIRECT_REMAP if MMU
+ 	select DMA_DIRECT_REMAP
  	select GENERIC_ATOMIC64
 -	select GENERIC_CLOCKEVENTS
  	select GENERIC_CPU_DEVICES
  	select GENERIC_IDLE_POLL_SETUP
  	select GENERIC_IRQ_PROBE
@@@ -142,19 -140,8 +139,9 @@@ config ADVANCED_OPTION
  comment "Default settings for advanced configuration options are used"
  	depends on !ADVANCED_OPTIONS
  
- config XILINX_UNCACHED_SHADOW
- 	bool "Are you using uncached shadow for RAM ?"
- 	depends on ADVANCED_OPTIONS && !MMU
- 	default n
- 	help
- 	  This is needed to be able to allocate uncachable memory regions.
- 	  The feature requires the design to define the RAM memory controller
- 	  window to be twice as large as the actual physical memory.
- 
  config HIGHMEM
  	bool "High memory support"
- 	depends on MMU
 +	select KMAP_LOCAL
  	help
  	  The address space of Microblaze processors is only 4 Gigabytes large
  	  and it has to accommodate user address space, kernel address
diff --cc arch/microblaze/mm/Makefile
index 8ced711000471,cd8a844bf29ee..75edfc110d3e3
--- a/arch/microblaze/mm/Makefile
+++ b/arch/microblaze/mm/Makefile
@@@ -3,6 -3,7 +3,4 @@@
  # Makefile
  #
  
--obj-y := consistent.o init.o
--
- obj-$(CONFIG_MMU) += pgtable.o mmu_context.o fault.o
 -obj-y += pgtable.o mmu_context.o fault.o
 -obj-$(CONFIG_HIGHMEM) += highmem.o
++obj-y := consistent.o init.o pgtable.o mmu_context.o fault.o