[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec, 1.2246, 1.2247 linux-2.6-pci-reverse-pci-config-space-restore-order.patch, 1.1, 1.2 linux-2.6-debug-pm-pci.patch, 1.2, NONE



Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12571

Modified Files:
	kernel-2.6.spec 
	linux-2.6-pci-reverse-pci-config-space-restore-order.patch 
Removed Files:
	linux-2.6-debug-pm-pci.patch 
Log Message:
merge 2 diffs into 1



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2246
retrieving revision 1.2247
diff -u -r1.2246 -r1.2247
--- kernel-2.6.spec	5 Jun 2006 04:21:04 -0000	1.2246
+++ kernel-2.6.spec	5 Jun 2006 16:56:33 -0000	1.2247
@@ -323,7 +323,6 @@
 Patch1031: linux-2.6-debug-periodic-slab-check.patch
 Patch1032: linux-2.6-debug-boot-delay.patch
 Patch1033: linux-2.6-debug-must_check.patch
-Patch1034: linux-2.6-debug-pm-pci.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -927,7 +926,6 @@
 #%patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
 
 #
 # Make /dev/mem a need-to-know function

linux-2.6-pci-reverse-pci-config-space-restore-order.patch:
 drivers/pci/pci.c                     |    6 +++++-
 linux-2.6.16.noarch/drivers/pci/pci.c |   12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

Index: linux-2.6-pci-reverse-pci-config-space-restore-order.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-pci-reverse-pci-config-space-restore-order.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-pci-reverse-pci-config-space-restore-order.patch	5 Jun 2006 04:21:06 -0000	1.1
+++ linux-2.6-pci-reverse-pci-config-space-restore-order.patch	5 Jun 2006 16:56:33 -0000	1.2
@@ -1,3 +1,28 @@
+
+--- linux-2.6.16.noarch/drivers/pci/pci.c~	2006-04-16 17:36:34.000000000 -0500
++++ linux-2.6.16.noarch/drivers/pci/pci.c	2006-04-16 17:37:42.000000000 -0500
+@@ -461,9 +461,17 @@ int 
+ pci_restore_state(struct pci_dev *dev)
+ {
+ 	int i;
++	int val;
+ 
+-	for (i = 0; i < 16; i++)
+-		pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
++	for (i = 0; i < 16; i++) {
++		pci_read_config_dword(dev, i * 4, &val);
++		if (val != dev->saved_config_space[i]) {
++			printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n",
++				pci_name(dev), i,
++				val, (int) dev->saved_config_space[i]);
++			pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
++		}
++	}
+ 	pci_restore_msi_state(dev);
+ 	pci_restore_msix_state(dev);
+ 	return 0;
+
+
 From akpm osdl org  Tue Apr 25 14:58:32 2006
 Message-Id: <200604250701 k3P71orx015389 shell0 pdx osdl net>
 Subject: PCI: reverse pci config space restore order


--- linux-2.6-debug-pm-pci.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]