Merge branch 'stable/processor-passthru.v5.rebased' into uek2-merge

* stable/processor-passthru.v5.rebased:
  xen/processor-passthru: Provide an driver that passes struct acpi_processor data to the hypervisor.
  xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.
  xen/setup/pm/acpi: Remove the call to boot_option_idle_override.
  xen/acpi: Domain0 acpi parser related platform hypercall
  xen/pm_idle: Make pm_idle be default_idle under Xen.
  cpuidle: stop depending on pm_idle
  cpuidle: replace xen access to x86 pm_idle and default_idle
  cpuidle: create bootparam "cpuidle.off=1"

Conflicts:
	drivers/xen/Kconfig
	drivers/xen/Makefile
	include/xen/interface/platform.h

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/xen/Kconfig
index 985041c7d35978b527e32d399cf389e1834f7da0,3ca691308808450bffd632876ab19fe73827bc4b..34b4010d8edde87f441499bcbcd061cb89263589
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -143,39 -105,18 +143,53 @@@ config SWIOTLB_XE
        depends on PCI
        select SWIOTLB
  
+ config XEN_PROCESSOR_PASSTHRU
+       tristate "Processor passthrough driver for Xen"
+       depends on XEN
+       depends on ACPI_PROCESSOR
+       depends on X86
+       depends on CPU_FREQ
+       help
+         This driver parses the processor structure and passes the information
+         to the Xen hypervisor. It is used to allow the Xen hypervisor to have the
+         full power management data and be able to select proper Cx and Pxx states.
+ 
+         The driver should be loaded after acpi processor and cpufreq drivers have
+         been loaded. If you do not know what to choose, select M here.
+ 
 +
 +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
 +      depends on XEN_BACKEND
 +      default m
 +      help
 +        The PCI device backend driver allows the kernel to export arbitrary
 +        PCI devices to other guests. If you select this to be a module, you
 +        will need to make sure no other driver has bound to the device(s)
 +        you want to make visible to other guests.
 +
 +        The parameter "passthrough" allows you specify how you want the PCI
 +        devices to appear in the guest. You can choose the default (0) where
 +        PCI topology starts at 00.00.0, or (1) for passthrough if you want
 +        the PCI devices topology appear the same as in the host.
 +
 +        The "hide" parameter (only applicable if backend driver is compiled
 +        into the kernel) allows you to bind the PCI devices to this module
 +        from the default device drivers. The argument is the list of PCI BDFs:
 +        xen-pciback.hide=(03:00.0)(04:00.0)
 +
 +        If in doubt, say m.
  endmenu

diff --cc drivers/xen/Makefile
index 48beb1d49fa47a7d53cccbae43e3195597a025b1,8a8c12ea897afcdea1a39e4e5aeb959ccb491d46..12346a125a8b2063016fa0c29daac23a4a133046
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -14,13 -14,10 +14,13 @@@ obj-$(CONFIG_XEN_GNTDEV)           += xen-gntdev
  obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)     += xen-gntalloc.o
  obj-$(CONFIG_XENFS)                   += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
 -obj-$(CONFIG_XEN_PLATFORM_PCI)                += xen-platform-pci.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_PROCESSOR_PASSTHRU)  += processor-passthru.o
 +obj-$(CONFIG_XEN_PCIDEV_BACKEND)      += xen-pciback/
  xen-evtchn-y                          := evtchn.o
  xen-gntdev-y                          := gntdev.o
  xen-gntalloc-y                                := gntalloc.o