Merge tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · ee69350759 - Gogs: Go Git Service GfA electronic

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

Linus Torvalds 11 years ago

parent

314814017c 7693decce8

commit

ee69350759

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm/Kconfig
							 
								View File
							
				@@ -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