diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 23:25:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 23:25:53 -0400 |
| commit | 7946844ae890282fa03f52d226d12dda48164f10 (patch) | |
| tree | d2d5f46ed12508efdd02c1da03383dba0a5320e0 /arch/arm/Kconfig | |
| parent | 4febd95a8a85dd38b1a71fcf9726e19c7fd20039 (diff) | |
| parent | d2e0bca377dc0f85acd19df465122f361a6c9e99 (diff) | |
Merge tag 'stable/for-linus-3.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen fixes from Konrad Rzeszutek Wilk:
- Compile warnings and errors (one on x86, two on ARM)
- WARNING in xen-pciback
- Use the acpi_processor_get_performance_info instead of the 'register'
version
* tag 'stable/for-linus-3.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/acpi: remove redundant acpi/acpi_drivers.h include
xen: arm: mandate EABI and use generic atomic operations.
acpi: Export the acpi_processor_get_performance_info
xen/pciback: Don't disable a PCI device that is already disabled.
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a98070fe7f14..2c3bdce15134 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1889,8 +1889,9 @@ config XEN_DOM0 | |||
| 1889 | 1889 | ||
| 1890 | config XEN | 1890 | config XEN |
| 1891 | bool "Xen guest support on ARM (EXPERIMENTAL)" | 1891 | bool "Xen guest support on ARM (EXPERIMENTAL)" |
| 1892 | depends on ARM && OF | 1892 | depends on ARM && AEABI && OF |
| 1893 | depends on CPU_V7 && !CPU_V6 | 1893 | depends on CPU_V7 && !CPU_V6 |
| 1894 | depends on !GENERIC_ATOMIC64 | ||
| 1894 | help | 1895 | help |
| 1895 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. | 1896 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |
| 1896 | 1897 | ||