diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-08 00:11:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-08 00:11:43 +0200 |
| commit | d75e2f902318cc20f3218e6823fe5463a8126bde (patch) | |
| tree | a08a87bab72df38d2f7f865bcb59cc43f608245b /arch/arm/Kconfig | |
| parent | Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | xen/arm: remove duplicated include from enlighten.c (diff) | |
| download | linux-d75e2f902318cc20f3218e6823fe5463a8126bde.tar.xz linux-d75e2f902318cc20f3218e6823fe5463a8126bde.zip | |
Merge tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen
Pull ARM Xen SMP updates from Stefano Stabellini:
"This contains a bunch of Xen/ARM specific changes, including some
fixes, SMP support for Xen on ARM, and moving the xenvm machine from
mach-vexpress to mach-virt.
The non-Xen files that are touched are arch/arm/Kconfig, to select
ARM_PSCI on XEN, and arch/arm/boot/dts/Makefile, to build the xenvm
DTB if CONFIG_ARCH_VIRT.
Highlights:
- Move xenvm to mach-virt.
- Implement SMP support in Xen on ARM.
- Add support for machine reboot and power off via Xen hypercalls"
* tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
xen/arm: remove duplicated include from enlighten.c
xen/arm: use sched_op hypercalls for machine reboot and power off
xenvm: add a simple PSCI node and a second cpu
xen/arm: XEN selects ARM_PSCI
xen: move the xenvm machine to mach-virt
xen/arm: SMP support
xen/arm: implement HYPERVISOR_vcpu_op
xen/arm: actually pass a non-NULL percpu pointer to request_percpu_irq
Diffstat (limited to 'arch/arm/Kconfig')
| -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 34ef016626ff..aa71a2321040 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1794,6 +1794,7 @@ config XEN depends on ARM && AEABI && OF depends on CPU_V7 && !CPU_V6 depends on !GENERIC_ATOMIC64 + select ARM_PSCI help Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |