Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee693507 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull Xen fix from Konrad Rzeszutek Wilk:
 "This has exactly one patch for Xen ARM.  It sets the dependency to
  compile the kernel with MMU enabled - otherwise - the guest won't work
  very well"

* tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  ARM: XEN depends on having a MMU
parents 31481401 7693decc

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1903,6 +1903,7 @@ config XEN 
	depends on ARM && AEABI && OF

	depends on CPU_V7 && !CPU_V6

	depends on !GENERIC_ATOMIC64

	depends on MMU

	select ARM_PSCI

	select SWIOTLB_XEN

	select ARCH_DMA_ADDR_T_64BIT