Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Poirier <bpoirier@suse.de>2015-02-02 10:55:20 +0800
committerBenjamin Poirier <bpoirier@suse.de>2015-02-02 10:55:20 +0800
commitc1e8c281614bd72323b719f4e2203770729c52cd (patch)
treec0164d7133e34bde5b616a9a17346f7e372c7ff5
parent9e2f76e65131a49e00e5590ab376cdc1aa3c3859 (diff)
- Refreshrpm-3.0.101-7
patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch. - Refresh patches.xen/xen3-patch-2.6.25.
-rw-r--r--patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch12
-rw-r--r--patches.xen/xen3-patch-2.6.254
2 files changed, 8 insertions, 8 deletions
diff --git a/patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch b/patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch
index 95bf5007af..e992ea0f03 100644
--- a/patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch
+++ b/patches.drivers/tg3-0080-PCI-tg3-Give-up-chip-reset-and-carrier-loss-handling.patch
@@ -125,11 +125,11 @@ Acked-by: Cho, Yu-Chen <acho@suse.com>
static DEFINE_SPINLOCK(resource_alignment_lock);
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -932,6 +932,7 @@ int pci_bus_find_capability(struct pci_b
- #ifdef CONFIG_HOTPLUG
- unsigned int pci_rescan_bus(struct pci_bus *bus);
- #endif
+@@ -870,6 +870,7 @@ void pci_update_resource(struct pci_dev
+ int __must_check pci_assign_resource(struct pci_dev *dev, int i);
+ int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
+ int pci_select_bars(struct pci_dev *dev, unsigned long flags);
+bool pci_device_is_present(struct pci_dev *pdev);
- /* Vital product data routines */
- ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
+ /* ROM control related routines */
+ int pci_enable_rom(struct pci_dev *pdev);
diff --git a/patches.xen/xen3-patch-2.6.25 b/patches.xen/xen3-patch-2.6.25
index 64ef574097..20f35a327e 100644
--- a/patches.xen/xen3-patch-2.6.25
+++ b/patches.xen/xen3-patch-2.6.25
@@ -27427,10 +27427,10 @@ Automatically created from "patches.kernel.org/patch-2.6.25" by xen-port-patches
PG_savepinned = PG_dirty,
--- sle11sp4.orig/include/linux/pci.h 2015-01-09 14:05:05.000000000 +0100
+++ sle11sp4/include/linux/pci.h 2013-02-05 16:13:55.000000000 +0100
-@@ -867,6 +867,9 @@ void pci_update_resource(struct pci_dev
- int __must_check pci_assign_resource(struct pci_dev *dev, int i);
+@@ -871,6 +871,9 @@ int __must_check pci_assign_resource(str
int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
int pci_select_bars(struct pci_dev *dev, unsigned long flags);
+ bool pci_device_is_present(struct pci_dev *pdev);
+#ifdef CONFIG_XEN
+void pci_restore_bars(struct pci_dev *);
+#endif