From dc944d0f66867cd4cb205bc372e77d325b02859d Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 22 Sep 2009 17:34:17 +0900
Subject: [PATCH] --- yaml --- r: 174735 b: refs/heads/master c:
 4c0eec7a86303ce6e3edf7825d0ef1d414e76767 h: refs/heads/master i:   174733:
 ad05b25bfb4e3fdeb5165def964691ddb4b3ea33   174731:
 351dfe74659fde5889c76cef6433d297b4baa4b1   174727:
 c532e96301409b2831006764e02452527aaa03f7   174719:
 54ce1bcd6db071e97c8b1bf2ecc53f24806f7904 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc/include/asm/pci_64.h | 2 --
 trunk/arch/sparc/kernel/pci.c         | 7 +++++++
 trunk/drivers/pci/pci.c               | 6 +-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 46a637ea3c3b..c571ee40bbfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1aa47b131416a6ff37eb1005a0a1d2541aad6c
+refs/heads/master: 4c0eec7a86303ce6e3edf7825d0ef1d414e76767
diff --git a/trunk/arch/sparc/include/asm/pci_64.h b/trunk/arch/sparc/include/asm/pci_64.h
index b63e51c3c3ee..b0576df6ec83 100644
--- a/trunk/arch/sparc/include/asm/pci_64.h
+++ b/trunk/arch/sparc/include/asm/pci_64.h
@@ -16,8 +16,6 @@
 
 #define PCI_IRQ_NONE		0xffffffff
 
-#define PCI_CACHE_LINE_BYTES	64
-
 static inline void pcibios_set_master(struct pci_dev *dev)
 {
 	/* No special bus mastering setup handling */
diff --git a/trunk/arch/sparc/kernel/pci.c b/trunk/arch/sparc/kernel/pci.c
index c68648662802..b85374f7cf94 100644
--- a/trunk/arch/sparc/kernel/pci.c
+++ b/trunk/arch/sparc/kernel/pci.c
@@ -1081,3 +1081,10 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
 	*start = rp->start - offset;
 	*end = rp->end - offset;
 }
+
+static int __init pcibios_init(void)
+{
+	pci_dfl_cache_line_size = 64 >> 2;
+	return 0;
+}
+subsys_initcall(pcibios_init);
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 1f9a7a03847b..01337b7a215f 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -47,17 +47,13 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE;
 unsigned long pci_hotplug_io_size  = DEFAULT_HOTPLUG_IO_SIZE;
 unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE;
 
-#ifndef PCI_CACHE_LINE_BYTES
-#define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES
-#endif
-
 /*
  * The default CLS is used if arch didn't set CLS explicitly and not
  * all pci devices agree on the same value.  Arch can override either
  * the dfl or actual value as it sees fit.  Don't forget this is
  * measured in 32-bit words, not bytes.
  */
-u8 pci_dfl_cache_line_size __initdata = PCI_CACHE_LINE_BYTES >> 2;
+u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2;
 u8 pci_cache_line_size;
 
 /**