From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 2 Feb 2012 20:03:05 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.3.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~595^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a9f2c653d0b507743033879cfd23d50cea9dffa;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/for-linus-3.3.rebased' into uek2-merge

* stable/for-linus-3.3.rebased: (39 commits)
  Merge conflict resolved. Somehow the letter 's' slipped in the Makefile. This fixes the compile issues.
  xen/events: BUG() when we can't allocate our event->irq array.
  xen/granttable: Disable grant v2 for HVM domains.
  xen-blkfront: Use kcalloc instead of kzalloc to allocate array
  xen/pciback: Expand the warning message to include domain id.
  xen/pciback: Fix "device has been assigned to X domain!" warning
  xen/xenbus: don't reimplement kvasprintf via a fixed size buffer
  xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX
  xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
  Xen: consolidate and simplify struct xenbus_driver instantiation
  xen-gntalloc: introduce missing kfree
  xen/xenbus: Fix compile error - missing header for xen_initial_domain()
  xen/netback: Enable netback on HVM guests
  xen/grant-table: Support mappings required by blkback
  xenbus: Use grant-table wrapper functions
  xenbus: Support HVM backends
  xen/xenbus-frontend: Fix compile error with randconfig
  xen/xenbus-frontend: Make error message more clear
  xen/privcmd: Remove unused support for arch specific privcmp mmap
  xen: Add xenbus_backend device
  ...

Conflicts:
	drivers/xen/Kconfig
	drivers/xen/balloon.c

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

1a9f2c653d0b507743033879cfd23d50cea9dffa
diff --cc drivers/xen/Kconfig
index 640bbf534504,c825a23be962..21369b0e43c2
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -147,13 -96,12 +148,19 @@@ config SWIOTLB_XE
  	depends on PCI
  	select SWIOTLB
  
+ 
+ config XEN_PRIVCMD
+ 	tristate
+ 	depends on XEN
+ 	default m
+ 
 +config XEN_TMEM
 +	bool
 +	default y if (CLEANCACHE || FRONTSWAP)
 +	help
 +	  Shim to interface in-kernel Transcendent Memory hooks
 +	  (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
  config XEN_PCIDEV_BACKEND
  	tristate "Xen PCI-device backend driver"
  	depends on PCI && X86 && XEN
diff --cc drivers/xen/Makefile
index f67450c99511,db9ec7274965..7ef71de53823
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -15,13 -15,10 +15,14 @@@ obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)	+= xe
  obj-$(CONFIG_XENFS)			+= xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)	+= sys-hypervisor.o
  obj-$(CONFIG_XEN_PVHVM)			+= platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)			+= tmem.o
  obj-$(CONFIG_SWIOTLB_XEN)		+= swiotlb-xen.o
  obj-$(CONFIG_XEN_DOM0)			+= pci.o
+ obj-$(CONFIG_XEN_PRIVCMD)		+= xen-privcmd.o
  obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= xen-pciback/
 +ifdef CONFIG_ACPI_PROCESSOR_XEN
 +obj-$(CONFIG_ACPI_PROCESSOR)		+= acpi_processor.o
 +endif
  
  xen-evtchn-y				:= evtchn.o
  xen-gntdev-y				:= gntdev.o