[kernel] r15759 - in dists/sid/linux-2.6/debian: . patches/bugfix/parisc patches/series

[Ben Hutchings]

Author: benh
Date: Sat May 22 00:19:50 2010
New Revision: 15759

Log:
[hppa] Revert "parisc: Set PCI CLS early in boot."

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/parisc/Revert-parisc-Set-PCI-CLS-early-in-boot.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/14

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri May 21 23:35:43 2010	(r15758)
+++ dists/sid/linux-2.6/debian/changelog	Sat May 22 00:19:50 2010	(r15759)
@@ -11,6 +11,8 @@
   * [ia64] Enable SGI SN support and mspec driver (Closes: #582224)
   * iwlwifi: Disable QoS when connected to a non-QoS-capable AP
     (Closes: #578262)
+  * [hppa] Revert "parisc: Set PCI CLS early in boot.", erroneously
+    included in 2.6.32.13
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 18 May 2010 02:13:44 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/parisc/Revert-parisc-Set-PCI-CLS-early-in-boot.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/parisc/Revert-parisc-Set-PCI-CLS-early-in-boot.patch	Sat May 22 00:19:50 2010	(r15759)
@@ -0,0 +1,45 @@
+From ef2925a0fc92740921e71cb9d638dbe232838910 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 22 May 2010 01:16:55 +0100
+Subject: [PATCH] Revert "parisc: Set PCI CLS early in boot."
+
+This reverts commit 5d233bf3dcad483e5f89865aaf5973e67c1630b1.
+---
+ arch/parisc/kernel/pci.c |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
+index 9e74bfe..f7064ab 100644
+--- a/arch/parisc/kernel/pci.c
++++ b/arch/parisc/kernel/pci.c
+@@ -18,6 +18,7 @@
+ 
+ #include <asm/io.h>
+ #include <asm/system.h>
++#include <asm/cache.h>		/* for L1_CACHE_BYTES */
+ #include <asm/superio.h>
+ 
+ #define DEBUG_RESOURCES 0
+@@ -122,10 +123,6 @@ static int __init pcibios_init(void)
+ 	} else {
+ 		printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
+ 	}
+-
+-	/* Set the CLS for PCI as early as possible. */
+-	pci_cache_line_size = pci_dfl_cache_line_size;
+-
+ 	return 0;
+ }
+ 
+@@ -174,7 +171,7 @@ void pcibios_set_master(struct pci_dev *dev)
+ 	** upper byte is PCI_LATENCY_TIMER.
+ 	*/
+ 	pci_write_config_word(dev, PCI_CACHE_LINE_SIZE,
+-			      (0x80 << 8) | pci_cache_line_size);
++				(0x80 << 8) | (L1_CACHE_BYTES / sizeof(u32)));
+ }
+ 
+ 
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/14	Fri May 21 23:35:43 2010	(r15758)
+++ dists/sid/linux-2.6/debian/patches/series/14	Sat May 22 00:19:50 2010	(r15759)
@@ -8,3 +8,4 @@
 + features/all/macvtap-add-GSO-csum-offload-support.patch
 + bugfix/all/mac80211-explicitly-disable-enable-QoS.patch
 + bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch
++ bugfix/parisc/Revert-parisc-Set-PCI-CLS-early-in-boot.patch