diff options
author | Tejun Heo <tj@kernel.org> | 2009-09-22 04:34:17 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-04 11:47:10 -0500 |
commit | 4c0eec7a86303ce6e3edf7825d0ef1d414e76767 (patch) | |
tree | 21a073cf9669861cc28593d23ad59bf3dcb9a732 /drivers/pci/pci.c | |
parent | ac1aa47b131416a6ff37eb1005a0a1d2541aad6c (diff) |
sparc64/PCI: drop PCI_CACHE_LINE_BYTES
sparc64 is now the only user of PCI_CACHE_LINE_BYTES. Drop it and set
pci_dfl_cache_line_size from pcibios_init() instead and drop
PCI_CACHE_LINE_BYTES handling from generic pci code.
Orignally-From: David Miller <davem@davemloft.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1f9a7a03847b..01337b7a215f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -47,17 +47,13 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE; | |||
47 | unsigned long pci_hotplug_io_size = DEFAULT_HOTPLUG_IO_SIZE; | 47 | unsigned long pci_hotplug_io_size = DEFAULT_HOTPLUG_IO_SIZE; |
48 | unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE; | 48 | unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE; |
49 | 49 | ||
50 | #ifndef PCI_CACHE_LINE_BYTES | ||
51 | #define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES | ||
52 | #endif | ||
53 | |||
54 | /* | 50 | /* |
55 | * The default CLS is used if arch didn't set CLS explicitly and not | 51 | * The default CLS is used if arch didn't set CLS explicitly and not |
56 | * all pci devices agree on the same value. Arch can override either | 52 | * all pci devices agree on the same value. Arch can override either |
57 | * the dfl or actual value as it sees fit. Don't forget this is | 53 | * the dfl or actual value as it sees fit. Don't forget this is |
58 | * measured in 32-bit words, not bytes. | 54 | * measured in 32-bit words, not bytes. |
59 | */ | 55 | */ |
60 | u8 pci_dfl_cache_line_size __initdata = PCI_CACHE_LINE_BYTES >> 2; | 56 | u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2; |
61 | u8 pci_cache_line_size; | 57 | u8 pci_cache_line_size; |
62 | 58 | ||
63 | /** | 59 | /** |