From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 05:39:02 +0000 (+1000)
Subject: Merge remote-tracking branch 'xen-two/linux-next'
X-Git-Tag: next-20121003~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18fc875c4f9a3614b44c013da520cb77573b6361;p=karo-tx-linux.git

Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-vexpress/Makefile.boot
	drivers/xen/Makefile
---

18fc875c4f9a3614b44c013da520cb77573b6361
diff --cc arch/arm/Kconfig
index d85d2cf9d151,33614669a9a0..644a5b8b45a7
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1836,6 -1891,22 +1836,16 @@@ config CC_STACKPROTECTO
  	  neutralized via a kernel panic.
  	  This feature requires gcc version 4.2 or above.
  
 -config DEPRECATED_PARAM_STRUCT
 -	bool "Provide old way to pass kernel parameters"
 -	help
 -	  This was deprecated in 2001 and announced to live on for 5 years.
 -	  Some old boot loaders still use this way.
 -
+ config XEN_DOM0
+ 	def_bool y
+ 	depends on XEN
+ 
+ config XEN
+ 	bool "Xen guest support on ARM (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL && ARM && OF
+ 	help
+ 	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
+ 
  endmenu
  
  menu "Boot options"
diff --cc arch/arm/boot/dts/Makefile
index 43c084c2cd66,000000000000..4745c1f68b49
mode 100644,000000..100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -1,101 -1,0 +1,102 @@@
 +ifeq ($(CONFIG_OF),y)
 +
 +dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \
 +	at91sam9263ek.dtb \
 +	at91sam9g20ek_2mmc.dtb \
 +	at91sam9g20ek.dtb \
 +	at91sam9g25ek.dtb \
 +	at91sam9m10g45ek.dtb \
 +	at91sam9n12ek.dtb \
 +	ethernut5.dtb \
 +	evk-pro3.dtb \
 +	kizbox.dtb \
 +	tny_a9260.dtb \
 +	tny_a9263.dtb \
 +	tny_a9g20.dtb \
 +	usb_a9260.dtb \
 +	usb_a9263.dtb \
 +	usb_a9g20.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
 +	exynos4210-smdkv310.dtb \
 +	exynos4210-trats.dtb \
 +	exynos5250-smdk5250.dtb
 +dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 +dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \
 +	imx53-ard.dtb \
 +	imx53-evk.dtb \
 +	imx53-qsb.dtb \
 +	imx53-smd.dtb
 +dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \
 +	imx6q-sabrelite.dtb \
 +	imx6q-sabresd.dtb
 +dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 +dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 +	kirkwood-dns325.dtb \
 +	kirkwood-dreamplug.dtb \
 +	kirkwood-goflexnet.dtb \
 +	kirkwood-ib62x0.dtb \
 +	kirkwood-iconnect.dtb \
 +	kirkwood-lschlv2.dtb \
 +	kirkwood-lsxhl.dtb \
 +	kirkwood-ts219-6281.dtb \
 +	kirkwood-ts219-6282.dtb
 +dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 +	msm8960-cdp.dtb
 +dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 +	armada-xp-db.dtb
 +dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 +	imx53-ard.dtb \
 +	imx53-evk.dtb \
 +	imx53-qsb.dtb \
 +	imx53-smd.dtb \
 +	imx6q-arm2.dtb \
 +	imx6q-sabrelite.dtb \
 +	imx6q-sabresd.dtb
 +dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
 +	imx23-olinuxino.dtb \
 +	imx23-stmp378x_devb.dtb \
 +	imx28-apx4devkit.dtb \
 +	imx28-cfa10036.dtb \
 +	imx28-cfa10049.dtb \
 +	imx28-evk.dtb \
 +	imx28-m28evk.dtb \
 +	imx28-tx28.dtb
 +dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 +	omap3-beagle-xm.dtb \
 +	omap3-evm.dtb \
 +	omap3-tobi.dtb \
 +	omap4-panda.dtb \
 +	omap4-pandaES.dtb \
 +	omap4-var_som.dtb \
 +	omap4-sdp.dtb \
 +	omap5-evm.dtb
 +dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 +dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
 +dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 +	r8a7740-armadillo800eva.dtb \
 +	sh73a0-kzm9g.dtb
 +dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
 +	spear1340-evb.dtb
 +dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
 +	spear310-evb.dtb \
 +	spear320-evb.dtb
 +dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 +dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 +	tegra20-medcom-wide.dtb \
 +	tegra20-paz00.dtb \
 +	tegra20-plutux.dtb \
 +	tegra20-seaboard.dtb \
 +	tegra20-tec.dtb \
 +	tegra20-trimslice.dtb \
 +	tegra20-ventana.dtb \
 +	tegra20-whistler.dtb \
 +	tegra30-cardhu-a02.dtb \
 +	tegra30-cardhu-a04.dtb
 +dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
 +	vexpress-v2p-ca9.dtb \
 +	vexpress-v2p-ca15-tc1.dtb \
- 	vexpress-v2p-ca15_a7.dtb
++	vexpress-v2p-ca15_a7.dtb \
++	xenvm-4.2.dtb
 +
 +endif
diff --cc drivers/xen/Makefile
index a4a3cab2f459,275abfc615cb..4dca78c204ce
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -4,8 -8,11 +8,12 @@@ obj-y	+= xenbus
  nostackp := $(call cc-option, -fno-stack-protector)
  CFLAGS_features.o			:= $(nostackp)
  
+ dom0-$(CONFIG_PCI) += pci.o
+ dom0-$(CONFIG_ACPI) += acpi.o
+ dom0-$(CONFIG_X86) += pcpu.o
++dom0-$(CONFIG_USB_SUPPORT) += dbgp.o
+ obj-$(CONFIG_XEN_DOM0)			+= $(dom0-y)
  obj-$(CONFIG_BLOCK)			+= biomerge.o
- obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
  obj-$(CONFIG_XEN_XENCOMM)		+= xencomm.o
  obj-$(CONFIG_XEN_BALLOON)		+= xen-balloon.o
  obj-$(CONFIG_XEN_SELFBALLOONING)	+= xen-selfballoon.o