[kernel] r18095 - in dists/squeeze/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Sep 16 03:00:31 2011
New Revision: 18095

Log:
PCI: Add definition of pci_pcie_cap(), used in backported e1000e driver

fixes FTBFS on armel, mips, mipsel, sparc

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/PCI-introduce-pci_pcie_cap.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/37

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 02:25:15 2011	(r18094)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 03:00:31 2011	(r18095)
@@ -4,6 +4,8 @@
   * pm: Fix definition of SET_SYSTEM_SLEEP_PM_OPS used in backported drivers
     (fixes FTBFS on ia64)
   * splice: Fix write position in output file (Closes: #641419)
+  * PCI: Add definition of pci_pcie_cap(), used in backported e1000e
+    (fixes FTBFS on armel, mips, mipsel, sparc)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 14 Sep 2011 14:47:36 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/features/all/PCI-introduce-pci_pcie_cap.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/PCI-introduce-pci_pcie_cap.patch	Fri Sep 16 03:00:31 2011	(r18095)
@@ -0,0 +1,42 @@
+From 8540f0cfe3c3eb59888f42ced0882cd549b84578 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 11 Nov 2009 14:29:54 +0900
+Subject: [PATCH] PCI: introduce pci_pcie_cap()
+
+Added in commit d7b7e60526d54da4c94afe5f137714cee7d05c41 upstream.
+However, we don't have and can't add the 'pcie_cap' field to
+struct pci_dev.
+---
+ include/linux/pci.h |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index 9a18b5f..81c2d57 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -1300,6 +1300,22 @@ extern void pci_hp_create_module_link(struct pci_slot *pci_slot);
+ extern void pci_hp_remove_module_link(struct pci_slot *pci_slot);
+ #endif
+ 
++/**
++ * pci_pcie_cap - get the saved PCIe capability offset
++ * @dev: PCI device
++ *
++ * PCIe capability offset is calculated at PCI device initialization
++ * time and saved in the data structure. This function returns saved
++ * PCIe capability offset. Using this instead of pci_find_capability()
++ * reduces unnecessary search in the PCI configuration space. If you
++ * need to calculate PCIe capability offset from raw device for some
++ * reasons, please use pci_find_capability() instead.
++ */
++static inline int pci_pcie_cap(struct pci_dev *dev)
++{
++	return pci_find_capability(dev, PCI_CAP_ID_EXP);
++}
++
+ #define PCI_VPD_LRDT			0x80	/* Large Resource Data Type */
+ #define PCI_VPD_LRDT_ID(x)		(x | PCI_VPD_LRDT)
+ 
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/37
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/37	Fri Sep 16 02:25:15 2011	(r18094)
+++ dists/squeeze/linux-2.6/debian/patches/series/37	Fri Sep 16 03:00:31 2011	(r18095)
@@ -1,3 +1,4 @@
 - features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS.patch
 + features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch
 + bugfix/all/splice-direct_splice_actor-should-not-use-pos-in-sd.patch
++ features/all/PCI-introduce-pci_pcie_cap.patch