Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.drivers / acpi-pci-remove-obsolete-_osc-capability-support-functions.patch

diff --git a/src/patches/suse-2.6.27.25/patches.drivers/acpi-pci-remove-obsolete-_osc-capability-support-functions.patch b/src/patches/suse-2.6.27.25/patches.drivers/acpi-pci-remove-obsolete-_osc-capability-support-functions.patch
new file mode 100644 (file)
index 0000000..55ab134
--- /dev/null
+++ b/src/patches/suse-2.6.27.25/patches.drivers/acpi-pci-remove-obsolete-_osc-capability-support-functions.patch
@@ -0,0 +1,82 @@
+From 23616941914917cf25b94789856b5326b68d8ee8 Mon Sep 17 00:00:00 2001
+From: Andrew Patterson <andrew.patterson@hp.com>
+Date: Mon, 10 Nov 2008 15:31:10 -0700
+Subject: ACPI/PCI: remove obsolete _OSC capability support functions
+Patch-mainline: 2.6.29
+References: bnc#438941
+
+The acpi_query_osc, __pci_osc_support_set, pci_osc_support_set, and
+pcie_osc_support_set functions have been obsoleted in favor of setting
+these capabilities during root bridge discovery with
+pci_acpi_osc_support.  There are no longer any callers of these
+functions, so remove them.
+
+Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+--- a/drivers/pci/pci-acpi.c
++++ b/drivers/pci/pci-acpi.c
+@@ -173,32 +173,6 @@ out:
+       return rc;
+ }
+ 
+-static acpi_status acpi_query_osc(acpi_handle handle, u32 level,
+-                                void *context, void **retval)
+-{
+-      pci_acpi_osc_support(handle, (unsigned long)context);
+-      return AE_OK;
+-}
+-
+-
+-/**
+- * __pci_osc_support_set - register OS support to Firmware
+- * @flags: OS support bits
+- * @hid: hardware ID
+- *
+- * Update OS support fields and doing a _OSC Query to obtain an update
+- * from Firmware on supported control bits.
+- **/
+-acpi_status __pci_osc_support_set(u32 flags, const char *hid)
+-{
+-      if (!(flags & OSC_SUPPORT_MASKS))
+-              return AE_TYPE;
+-
+-      acpi_get_devices(hid, acpi_query_osc,
+-                       (void *)(unsigned long)flags, NULL);
+-      return AE_OK;
+-}
+-
+ /**
+  * pci_osc_control_set - commit requested control to Firmware
+  * @handle: acpi_handle for the target ACPI object
+diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
+index 424f06f..871e096 100644
+--- a/include/linux/pci-acpi.h
++++ b/include/linux/pci-acpi.h
+@@ -50,16 +50,7 @@
+ 
+ #ifdef CONFIG_ACPI
+ extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
+-extern acpi_status __pci_osc_support_set(u32 flags, const char *hid);
+ int pci_acpi_osc_support(acpi_handle handle, u32 flags);
+-static inline acpi_status pci_osc_support_set(u32 flags)
+-{
+-      return __pci_osc_support_set(flags, PCI_ROOT_HID_STRING);
+-}
+-static inline acpi_status pcie_osc_support_set(u32 flags)
+-{
+-      return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);
+-}
+ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
+ {
+       /* Find root host bridge */
+@@ -76,8 +67,6 @@ typedef u32          acpi_status;
+ #endif    
+ static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
+ {return AE_ERROR;}
+-static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} 
+-static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}
+ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
+ { return NULL; }
+ #endif