diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 09:53:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 09:53:24 -0800 |
| commit | ee693507591942792f9853783e36002ff3a82954 (patch) | |
| tree | 12338aa1830fcc889094420cbc0588f64754ccb6 /arch | |
| parent | 314814017c3525b7f4796056f779f3e67e08d396 (diff) | |
| parent | 7693decce869a94821bed1fa6c237c7224096b5b (diff) | |
| download | linux-ee693507591942792f9853783e36002ff3a82954.tar.gz linux-ee693507591942792f9853783e36002ff3a82954.tar.bz2 linux-ee693507591942792f9853783e36002ff3a82954.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e25419817791..1eb3a250210a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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 |