From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 13 Dec 2011 17:09:34 +0000 (-0500)
Subject: Merge branch 'stable/acpi-cpufreq.v3.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~830^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3acb13af318b052c429430359fec3871b5ad2800;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/acpi-cpufreq.v3.rebased' into uek2-merge

.. which is not yet upstream, albeit it has been posted:
https://lkml.org/lkml/2011/11/30/245

but it still needs guidance from the ACPI maintainers - but they are right
now busy with the ACPI v5.0 so for the time being carrying this patch
out of the tree.

In the future we will have to revert this and insert the one that is in
the upstream kernel.

* stable/acpi-cpufreq.v3.rebased:
  ACPI: xen processor: set ignore_ppc to handle PPC event for Xen vcpu.
  ACPI: xen processor: add PM notification interfaces.
  ACPI: processor: override the interface of register acpi processor handler for Xen vcpu
  ACPI: add processor driver for Xen virtual CPUs.
  ACPI: processor: add __acpi_processor_[un]register_driver helpers.
  ACPI: processor: cache acpi_power_register in cx structure
  ACPI: processor: Don't setup cpu idle handler when we do not want them.
  ACPI: processor: export necessary interfaces
  xen/acpi: Domain0 acpi parser related platform hypercall

Conflicts:
	drivers/xen/Makefile
---

3acb13af318b052c429430359fec3871b5ad2800
diff --cc drivers/xen/Makefile
index 974fffdf22b2,91032c620517..f67450c99511
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -14,11 -14,12 +14,14 @@@ 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_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